Merge commit '7dceec7eca28ad80849b5d68c094192bed823f42' into renovate…

…/typescript-json-schema-0.x # Conflicts: # package.json # pnpm-lock.yaml
electron-userland · Sep 20, 2024 · 9ef94a4 · 9ef94a4
2 parents 5b50154 + 7dceec7
commit 9ef94a4
Show file tree

Hide file tree

Showing 29 changed files with 165 additions and 777 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,10 @@
 module.exports = {
   root: true,
   parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint"],
+  plugins: [
+    "@typescript-eslint",
+    '@stylistic',
+  ],
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
@@ -13,9 +16,11 @@ module.exports = {
     project: ["./packages/*/tsconfig.json"],
   },
   rules: {
+    "@typescript-eslint/no-require-imports": "off",
     semi: "off",
     "prettier/prettier": "warn",
-    "@typescript-eslint/member-delimiter-style": [
+    "@typescript-eslint/prefer-promise-reject-errors": "off",
+    "@stylistic/member-delimiter-style": [
       "error",
       {
         multiline: {
@@ -34,6 +39,14 @@ module.exports = {
     "@typescript-eslint/no-unsafe-call": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
     "no-constant-condition": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "warn", // or "error"
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ],
     "@typescript-eslint/no-var-requires": "off",
     "@typescript-eslint/explicit-function-return-type": [
       "off",

diff --git a/package.json b/package.json
@@ -49,27 +49,22 @@
     "@babel/plugin-transform-modules-commonjs": "7.24.8",
     "@changesets/changelog-github": "0.4.7",
     "@changesets/cli": "2.25.0",
+    "@stylistic/eslint-plugin": "^2.8.0",
     "@types/node": "^22.5.5",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "conventional-changelog-cli": "5.0.0",
-    "dmd": "6.1.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "fs-extra": "10.1.0",
     "husky": "7.0.4",
-    "jest-cli": "27.5.1",
     "lint-staged": "15.2.7",
-    "path-sort": "0.1.0",
     "prettier": "3.3.3",
-    "source-map-support": "0.5.21",
-    "ts-jsdoc": "3.2.2",
     "typedoc": "^0.26",
     "typedoc-plugin-markdown": "^4.2.7",
     "typescript": "^5.5",
-    "typescript-json-schema": "0.65.1",
-    "v8-compile-cache": "2.3.0"
+    "typescript-json-schema": "0.65.1"
   },
   "engines": {
     "node": ">=14.14",

diff --git a/packages/app-builder-lib/src/ProtonFramework.ts b/packages/app-builder-lib/src/ProtonFramework.ts
@@ -35,7 +35,7 @@ export class ProtonFramework extends LibUiFramework {
     } else {
       try {
         babel = require("babel-core")
-      } catch (e: any) {
+      } catch (_e: any) {
         // babel isn't installed
         log.debug(null, "don't transpile source code using Babel")
         return null

diff --git a/packages/app-builder-lib/src/asar/asarFileChecker.ts b/packages/app-builder-lib/src/asar/asarFileChecker.ts
@@ -17,7 +17,7 @@ export async function checkFileInArchive(asarFile: string, relativeFile: string,
   let stat: Node | null
   try {
     stat = fs.getFile(relativeFile)
-  } catch (e: any) {
+  } catch (_e: any) {
     const fileStat = await statOrNull(asarFile)
     if (fileStat == null) {
       throw error(`does not exist. Seems like a wrong configuration.`)

diff --git a/packages/app-builder-lib/src/asar/asarUtil.ts b/packages/app-builder-lib/src/asar/asarUtil.ts
@@ -154,7 +154,7 @@ export class AsarPackager {
   }
 
   private writeAsarFile(fileSets: Array<ResolvedFileSet>, unpackedFileIndexMap: Map<ResolvedFileSet, Set<number>>): Promise<any> {
-    return new Promise((resolve, reject) => {
+    return new Promise<string>((resolve, reject) => {
       const headerPickle = pickle.createEmpty()
       headerPickle.writeString(JSON.stringify(this.fs.header))
       const headerBuf = headerPickle.toBuffer()

diff --git a/packages/app-builder-lib/src/fileMatcher.ts b/packages/app-builder-lib/src/fileMatcher.ts
@@ -53,7 +53,7 @@ export class FileMatcher {
     from: string,
     to: string,
     readonly macroExpander: (pattern: string) => string,
-    patterns?: Array<string> | string | null | undefined
+    patterns?: Array<string> | string | null
   ) {
     this.from = ensureNoEndSlash(macroExpander(from))
     this.to = ensureNoEndSlash(macroExpander(to))

diff --git a/packages/app-builder-lib/src/publish/PublishManager.ts b/packages/app-builder-lib/src/publish/PublishManager.ts
@@ -345,7 +345,7 @@ function requireProviderClass(provider: string, packager: Packager): any | null
       let module: any = null
       try {
         module = require(path.join(packager.buildResourcesDir, name + ".js"))
-      } catch (ignored) {
+      } catch (_ignored) {
         log.debug({ path: path.join(packager.buildResourcesDir, name + ".js") }, "Unable to find publish provider in build resources")
       }
 

diff --git a/packages/app-builder-lib/src/util/config/config.ts b/packages/app-builder-lib/src/util/config/config.ts
@@ -60,7 +60,7 @@ export async function getConfig(
       let file = "electron-webpack/out/electron-builder.js"
       try {
         file = require.resolve(file)
-      } catch (ignore) {
+      } catch (_ignore) {
         file = require.resolve("electron-webpack/electron-builder.yml")
       }
       config.extends = `file:${file}`

diff --git a/packages/app-builder-lib/src/util/config/load.ts b/packages/app-builder-lib/src/util/config/load.ts
@@ -107,7 +107,7 @@ export async function loadParentConfig<T>(request: ReadConfigRequest, spec: stri
     let resolved: string | null = null
     try {
       resolved = require.resolve(spec)
-    } catch (e) {
+    } catch (_e) {
       // ignore
     }
 

diff --git a/packages/app-builder-lib/src/util/packageMetadata.ts b/packages/app-builder-lib/src/util/packageMetadata.ts
@@ -24,7 +24,7 @@ async function authors(file: string, data: any) {
   let authorData
   try {
     authorData = await readFile(path.resolve(path.dirname(file), "AUTHORS"), "utf8")
-  } catch (ignored) {
+  } catch (_ignored) {
     return
   }
 

diff --git a/packages/builder-util-runtime/src/CancellationToken.ts b/packages/builder-util-runtime/src/CancellationToken.ts
@@ -52,7 +52,7 @@ export class CancellationToken extends EventEmitter {
         try {
           this.removeListener("cancel", cancelHandler)
           cancelHandler = null
-        } catch (ignore) {
+        } catch (_ignore) {
           // ignore
         }
       }

diff --git a/packages/builder-util/src/fs.ts b/packages/builder-util/src/fs.ts
@@ -35,7 +35,7 @@ export async function exists(file: string): Promise<boolean> {
   try {
     await access(file)
     return true
-  } catch (e: any) {
+  } catch (_e: any) {
     return false
   }
 }

diff --git a/packages/dmg-builder/src/dmg.ts b/packages/dmg-builder/src/dmg.ts
@@ -312,7 +312,7 @@ async function customizeDmg(volumePath: string, specification: DmgOptions, packa
   }
   try {
     await executePython("python3")
-  } catch (error: any) {
+  } catch (_error: any) {
     await executePython("python")
   }
   return packager.packagerOptions.effectiveOptionComputed == null || !(await packager.packagerOptions.effectiveOptionComputed({ volumePath, specification, packager }))

diff --git a/packages/electron-updater/src/DownloadedUpdateHelper.ts b/packages/electron-updater/src/DownloadedUpdateHelper.ts
@@ -90,7 +90,7 @@ export class DownloadedUpdateHelper {
     try {
       // remove stale data
       await emptyDir(this.cacheDirForPendingUpdate)
-    } catch (ignore) {
+    } catch (_ignore) {
       // ignore
     }
   }

diff --git a/packages/electron-updater/src/NsisUpdater.ts b/packages/electron-updater/src/NsisUpdater.ts
@@ -90,7 +90,7 @@ export class NsisUpdater extends BaseUpdater {
             } catch (e: any) {
               try {
                 await unlink(packageFile)
-              } catch (ignored) {
+              } catch (_ignored) {
                 // ignore
               }
 

diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts
@@ -108,7 +108,7 @@ export abstract class DifferentialDownloader {
             } catch (errorOnLog) {
               try {
                 console.error(errorOnLog)
-              } catch (ignored) {
+              } catch (_ignored) {
                 // ok, give up and ignore error
               }
             }