fix: allow typescript typechecking for electron-updater .d.ts (#8372)

electron-userland · Jul 23, 2024 · c85b73d · c85b73d
1 parent e74f8f0
commit c85b73d
Show file tree

Hide file tree

Showing 15 changed files with 166 additions and 9,273 deletions.
diff --git a/.changeset/selfish-ligers-cry.md b/.changeset/selfish-ligers-cry.md
@@ -0,0 +1,7 @@
+---
+"app-builder-lib": patch
+"electron-builder": patch
+"electron-updater": patch
+---
+
+fix: allow enabling tsc lib checking on electron-updater package
diff --git a/packages/app-builder-lib/tsconfig-scheme.json b/packages/app-builder-lib/tsconfig-scheme.json
@@ -9,6 +9,5 @@
         "../../typings/*.d.ts"
     ],
     "exclude": [
-        "../../typings/electron.d.ts"
     ]
 }
diff --git a/packages/app-builder-lib/tsconfig.json b/packages/app-builder-lib/tsconfig.json
@@ -14,7 +14,6 @@
       "../../typings/*.d.ts"
   ],
   "exclude": [
-      "../../typings/electron.d.ts"
   ],
   "references": [
     {

diff --git a/packages/electron-builder/tsconfig.json b/packages/electron-builder/tsconfig.json
@@ -28,6 +28,5 @@
     "../../typings/*.d.ts"
   ],
   "exclude": [
-    "../../typings/electron.d.ts"
   ]
 }
diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json
@@ -30,7 +30,8 @@
     "@types/js-yaml": "4.0.3",
     "@types/lodash.escaperegexp": "4.1.6",
     "@types/lodash.isequal": "4.5.5",
-    "@types/semver": "^7.3.13"
+    "@types/semver": "^7.3.13",
+    "electron": "^31.2.1"
   },
   "typings": "./out/main.d.ts",
   "publishConfig": {

diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts
@@ -30,7 +30,7 @@ import { createClient, isUrlProbablySupportMultiRangeRequests } from "./provider
 import { ProviderPlatform } from "./providers/Provider"
 import type { TypedEmitter } from "tiny-typed-emitter"
 import Session = Electron.Session
-import { AuthInfo } from "electron"
+import type { AuthInfo } from "electron"
 import { gunzipSync } from "zlib"
 import { blockmapFiles } from "./util"
 import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader"

diff --git a/packages/electron-updater/src/ElectronAppAdapter.ts b/packages/electron-updater/src/ElectronAppAdapter.ts
@@ -21,7 +21,7 @@ export class ElectronAppAdapter implements AppAdapter {
   }
 
   get appUpdateConfigPath(): string {
-    return this.isPackaged ? path.join(process.resourcesPath!, "app-update.yml") : path.join(this.app.getAppPath(), "dev-app-update.yml")
+    return this.isPackaged ? path.join(process.resourcesPath, "app-update.yml") : path.join(this.app.getAppPath(), "dev-app-update.yml")
   }
 
   get userDataPath(): string {
@@ -41,6 +41,6 @@ export class ElectronAppAdapter implements AppAdapter {
   }
 
   onQuit(handler: (exitCode: number) => void): void {
-    this.app.once("quit", (_: Event, exitCode: number) => handler(exitCode))
+    this.app.once("quit", (_: Electron.Event, exitCode: number) => handler(exitCode))
   }
 }
diff --git a/packages/electron-updater/src/NsisUpdater.ts b/packages/electron-updater/src/NsisUpdater.ts
@@ -144,7 +144,7 @@ export class NsisUpdater extends BaseUpdater {
     }
 
     const callUsingElevation = (): void => {
-      this.spawnLog(path.join(process.resourcesPath!, "elevate.exe"), [options.installerPath].concat(args)).catch(e => this.dispatchError(e))
+      this.spawnLog(path.join(process.resourcesPath, "elevate.exe"), [options.installerPath].concat(args)).catch(e => this.dispatchError(e))
     }
 
     if (options.isAdminRightsRequired) {

diff --git a/packages/electron-updater/src/electronHttpExecutor.ts b/packages/electron-updater/src/electronHttpExecutor.ts
@@ -1,5 +1,5 @@
 import { DownloadOptions, HttpExecutor, configureRequestOptions, configureRequestUrl } from "builder-util-runtime"
-import { AuthInfo } from "electron"
+import type { AuthInfo } from "electron"
 import { RequestOptions } from "http"
 import Session = Electron.Session
 import ClientRequest = Electron.ClientRequest
@@ -65,7 +65,7 @@ export class ElectronHttpExecutor extends HttpExecutor<Electron.ClientRequest> {
     const request = require("electron").net.request({
       ...options,
       session: this.cachedSession,
-    }) as Electron.ClientRequest
+    })
     request.on("response", callback)
     if (this.proxyLoginCallback != null) {
       request.on("login", this.proxyLoginCallback)

diff --git a/packages/electron-updater/src/main.ts b/packages/electron-updater/src/main.ts
@@ -31,7 +31,7 @@ function doLoadAutoUpdater(): AppUpdater {
   } else {
     _autoUpdater = new (require("./AppImageUpdater").AppImageUpdater)()
     try {
-      const identity = path.join(process.resourcesPath!, "package-type")
+      const identity = path.join(process.resourcesPath, "package-type")
       if (!existsSync(identity)) {
         return _autoUpdater
       }

diff --git a/packages/electron-updater/tsconfig.json b/packages/electron-updater/tsconfig.json
@@ -10,7 +10,6 @@
     "access": "public"
   },
   "files": [
-    "../../typings/electron.d.ts"
   ],
   "include": [
     "src/**/*.ts"