chore: running eslint --fix on more files (#9502)

Author: mmaietta

.changeset/hip-rocks-warn.md

@@ -0,0 +1,6 @@
+---
+"app-builder-lib": patch
+"electron-updater": patch
+---
+
+chore: running `eslint --fix` on more files

eslint.config.mjs

@@ -20,9 +20,13 @@ export default [{
       "**/out",
       // used for CLI
       "**/main.js",
+      "test/vitest-setup.ts",
       "packages/app-builder-lib/helpers",
       "packages/electron-builder/cli.js",
-      "packages/electron-builder/install-app-deps.js"
+      "packages/electron-builder/install-app-deps.js",
+      "packages/app-builder-lib/src/node-module-collector/hoist.ts", // @yarn/pkg vendor code
+      "test/fixtures/**",
+      "test/src/helpers/**",
     ],
 }, ...compat.extends(
     "eslint:recommended",
@@ -52,6 +56,9 @@ export default [{
         "prettier/prettier": "warn",
         "@typescript-eslint/prefer-promise-reject-errors": "off",
 
+        "curly": ["error", "all"],
+        "nonblock-statement-body-position": ["error", "below"],
+
         "@stylistic/member-delimiter-style": ["error", {
             multiline: {
                 delimiter: "none",

package.json

@@ -5,10 +5,10 @@
   "scripts": {
     "//": "do not wrap into single quotes - windows doesn't unwrap arg in this case",
     "compile": "tsc --build",
-    "lint": "eslint packages",
+    "lint": "eslint packages test/src --ext .ts,.js",
     "lint-deps": "node ./scripts/checkDeps.js",
     "pretest": "pnpm lint-deps && pnpm lint",
-    "prettier": "prettier 'packages/**/*.{ts,js}' test/src/**/*.ts --write",
+    "prettier": "prettier 'packages/**/*.{ts,js}' 'test/src/**/*.ts' --write",
     "///": "Please see https://github.com/electron-userland/electron-builder/blob/master/CONTRIBUTING.md#run-test-using-cli how to run particular test instead full (and very slow) run",
     "test-all": "pnpm compile && pnpm pretest && pnpm ci:test",
     "test-linux": "docker run --rm -e CI=\"${CI:-true}\" -e DEBUG=${DEBUG:-} -e UPDATE_SNAPSHOT=\"${UPDATE_SNAPSHOT:-false}\" -e TEST_FILES=\"${TEST_FILES:-HoistedNodeModuleTest}\" -w /project -v $(pwd):/project -v $(pwd)-node-modules:/project/node_modules -v $HOME/Library/Caches/electron:/root/.cache/electron -v $HOME/Library/Caches/electron-builder:/root/.cache/electron-builder ${ADDITIONAL_DOCKER_ARGS} ${TEST_RUNNER_IMAGE_TAG:-electronuserland/builder:22-wine-mono} /bin/bash -c \"bash ./docker/test-in-docker.sh\"",

packages/app-builder-lib/src/macPackager.ts

@@ -583,7 +583,9 @@ export class MacPackager extends PlatformPackager<MacConfiguration> {
       Object.assign(appPlist, extendInfo)
     }
     for (const [k, v] of Object.entries(appPlist)) {
-      if (v === null || v === undefined) delete appPlist[k]
+      if (v === null || v === undefined) {
+        delete appPlist[k]
+      }
     }
   }
 

packages/app-builder-lib/src/node-module-collector/hoist.ts

@@ -336,9 +336,10 @@ const decoupleGraphNode = (parent: HoisterWorkTree, node: HoisterWorkTree): Hois
     hoistedTo: new Map(hoistedTo),
   }
   const selfDep = clone.dependencies.get(name)
-  if (selfDep && selfDep.ident == clone.ident)
-    // Update self-reference
+  if (selfDep && selfDep.ident == clone.ident) // Update self-reference
+  {
     clone.dependencies.set(name, clone)
+  }
 
   parent.dependencies.set(clone.name, clone)
 
@@ -536,10 +537,11 @@ const getNodeHoistInfo = (
   let reasonRoot
   let reason: string | null = null
   let dependsOn: Set<HoisterWorkTree> | null = new Set()
-  if (outputReason)
+  if (outputReason) {
     reasonRoot = `${Array.from(rootNodePathLocators)
       .map(x => prettyPrintLocator(x))
       .join(`→`)}`
+  }
 
   const parentNode = nodePath[nodePath.length - 1]
   // We cannot hoist self-references
@@ -585,11 +587,12 @@ const getNodeHoistInfo = (
             shadowedNodes.set(parentNode, shadowedNames)
           }
           shadowedNames.add(node.name)
-          if (outputReason)
+          if (outputReason) {
             reason = `- filled by ${prettyPrintLocator(parentDep.locator)} at ${nodePath
               .slice(0, idx)
               .map(x => prettyPrintLocator(x.locator))
               .join(`→`)}`
+          }
           break
         }
       }

packages/app-builder-lib/src/util/packageDependencies.ts

@@ -4,7 +4,9 @@ import { executeAppBuilderAsJson } from "./appBuilder"
 export function createLazyProductionDeps<T extends boolean>(projectDir: string, excludedDependencies: Array<string> | null, flatten: T) {
   return new Lazy(async () => {
     const args = ["node-dep-tree", "--dir", projectDir]
-    if (flatten) args.push("--flatten")
+    if (flatten) {
+      args.push("--flatten")
+    }
     if (excludedDependencies != null) {
       for (const name of excludedDependencies) {
         args.push("--exclude-dep", name)

packages/electron-updater/src/providers/GitHubProvider.ts

@@ -81,7 +81,9 @@ export class GitHubProvider extends BaseGitHubProvider<GithubUpdateInfo> {
             const hrefElement = hrefRegExp.exec(element.element("link").attribute("href"))!
 
             // If this is null then something is wrong and skip this release
-            if (hrefElement === null) continue
+            if (hrefElement === null) {
+              continue
+            }
 
             // This Release's Tag
             const hrefTag = hrefElement[1]

test/src/HoistTest.ts

@@ -29,12 +29,16 @@ const getTreeHeight = (tree: HoisterResult): number => {
   const seen = new Set<HoisterResult>()
 
   const visitNode = (node: HoisterResult) => {
-    if (seen.has(node)) return
+    if (seen.has(node)) {
+      return
+    }
     seen.add(node)
 
     height += 1
     maxHeight = Math.max(height, maxHeight)
-    for (const dep of node.dependencies) visitNode(dep)
+    for (const dep of node.dependencies) {
+      visitNode(dep)
+    }
     height -= 1
   }
 

test/src/PublishManagerTest.ts

@@ -102,6 +102,7 @@ test.ifNotWindows("os macro", ({ expect }) =>
       publish: "always",
       projectDirCreated: async projectDir => {
         process.env.__TEST_S3_PUBLISHER__ = path.join(projectDir, "dist/s3")
+        return Promise.resolve()
       },
       packed: async context => {
         const dir = path.join(context.projectDir, "dist/s3")

test/src/concurrentBuildsTest.ts

@@ -15,7 +15,7 @@ const config: Configuration = {
   artifactName: "${productName}-${version}-${arch}.${ext}",
   compression: "store",
 }
-const projectDirCreated = async (projectDir: string, tmpDir: TmpDir) => {
+const projectDirCreated = async (projectDir: string, _tmpDir: TmpDir) => {
   const buildConfig = (data: any, isApp: boolean) => {
     deepAssign(data, {
       name: "concurrent", // needs to be lowercase for fpm targets (can't use default fixture TestApp)