feat: use electron-winstaller instead of self module

.changeset/breezy-seas-destroy.md

@@ -0,0 +1,6 @@
+---
+"app-builder-lib": patch
+"electron-builder-squirrel-windows": patch
+---
+
+use electron-winstaller instead of self module

docker/wine/Dockerfile

@@ -1,6 +1,10 @@
 ARG IMAGE_VERSION=latest
 FROM electronuserland/builder:$IMAGE_VERSION
 
+
+ENV WINEARCH=win64
+ENV WINEPREFIX=/root/.wine64
+
 RUN dpkg --add-architecture i386 && \
   curl -Lo /usr/share/keyrings/winehq.asc https://dl.winehq.org/wine-builds/winehq.key && \
   echo 'deb [signed-by=/usr/share/keyrings/winehq.asc] https://dl.winehq.org/wine-builds/ubuntu/ focal main' > /etc/apt/sources.list.d/winehq.list && \

packages/app-builder-lib/src/options/SquirrelWindowsOptions.ts

@@ -40,6 +40,11 @@ export interface SquirrelWindowsOptions extends TargetSpecificOptions {
    */
   readonly useAppIdAsId?: boolean
 
+  /**
+   *  The custom squirrel.windows.exe path. Defaults to `https://github.com/electron-userland/electron-builder-binaries/tree/master/Squirrel.Windows`.
+   */
+  readonly vendorDirectory?: string
+
   /**
    * https://github.com/electron-userland/electron-builder/issues/1743
    * @private

packages/electron-builder-squirrel-windows/package.json

@@ -12,13 +12,13 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "files": [
-    "out"
+    "out",
+    "template.nuspectemplate"
   ],
   "dependencies": {
     "app-builder-lib": "workspace:*",
-    "archiver": "^5.3.1",
     "builder-util": "workspace:*",
-    "fs-extra": "^10.1.0"
+    "electron-winstaller":"5.4.0"
   },
   "devDependencies": {
     "@types/archiver": "5.3.1",

packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts

@@ -1,10 +1,10 @@
 import { sanitizeFileName } from "builder-util/out/filename"
 import { InvalidConfigurationError, log, isEmptyOrSpaces } from "builder-util"
-import { getBinFromUrl } from "app-builder-lib/out/binDownload"
 import { Arch, getArchSuffix, SquirrelWindowsOptions, Target } from "app-builder-lib"
 import { WinPackager } from "app-builder-lib/out/winPackager"
 import * as path from "path"
-import { convertVersion, SquirrelBuilder, SquirrelOptions } from "./squirrelPack"
+import * as fs from "fs"
+import { Options as SquirrelOptions, createWindowsInstaller, convertVersion } from "electron-winstaller"
 
 export default class SquirrelWindowsTarget extends Target {
   //tslint:disable-next-line:no-object-literal-type-assertion
@@ -22,10 +22,7 @@ export default class SquirrelWindowsTarget extends Target {
     const version = packager.appInfo.version
     const sanitizedName = sanitizeFileName(this.appName)
 
-    // tslint:disable-next-line:no-invalid-template-strings
     const setupFile = packager.expandArtifactNamePattern(this.options, "exe", arch, "${productName} Setup ${version}.${ext}")
-    const packageFile = `${sanitizedName}-${convertVersion(version)}-full.nupkg`
-
     const installerOutDir = path.join(this.outDir, `squirrel-windows${getArchSuffix(arch)}`)
     const artifactPath = path.join(installerOutDir, setupFile)
 
@@ -40,8 +37,15 @@ export default class SquirrelWindowsTarget extends Target {
     }
 
     const distOptions = await this.computeEffectiveDistOptions()
-    const squirrelBuilder = new SquirrelBuilder(distOptions, installerOutDir, packager)
-    await squirrelBuilder.buildInstaller({ setupFile, packageFile }, appOutDir, this.outDir, arch)
+    if (distOptions.vendorDirectory) {
+      this.select7zipArch(distOptions.vendorDirectory, arch)
+    }
+
+    await createWindowsInstaller({
+      ...distOptions,
+      appDirectory: appOutDir,
+      outputDirectory: installerOutDir,
+    })
 
     await packager.info.callArtifactBuildCompleted({
       file: artifactPath,
@@ -79,6 +83,13 @@ export default class SquirrelWindowsTarget extends Target {
     return this.options.name || this.packager.appInfo.name
   }
 
+  private select7zipArch(vendorDirectory: string, arch: Arch) {
+    // Copy the 7-Zip executable for the configured architecture.
+    const resolvedArch = getArchSuffix(arch) === "" ? process.arch : getArchSuffix(arch)
+    fs.copyFileSync(path.join(vendorDirectory, `7z-${resolvedArch}.exe`), path.join(vendorDirectory, "7z.exe"))
+    fs.copyFileSync(path.join(vendorDirectory, `7z-${resolvedArch}.dll`), path.join(vendorDirectory, "7z.dll"))
+  }
+
   async computeEffectiveDistOptions(): Promise<SquirrelOptions> {
     const packager = this.packager
     let iconUrl = this.options.iconUrl
@@ -98,24 +109,33 @@ export default class SquirrelWindowsTarget extends Target {
     const appInfo = packager.appInfo
     const projectUrl = await appInfo.computePackageUrl()
     const appName = this.appName
+    const vendorDirectory = this.options.vendorDirectory
     const options: SquirrelOptions = {
       name: appName,
-      productName: this.options.name || appInfo.productName,
       appId: this.options.useAppIdAsId ? appInfo.id : appName,
       version: appInfo.version,
       description: appInfo.description,
-      // better to explicitly set to empty string, to avoid any nugget errors
+      exe: `${this.packager.platformSpecificBuildOptions.executableName || this.options.name || appInfo.productName}.exe`,
       authors: appInfo.companyName || "",
       iconUrl,
       extraMetadataSpecs: projectUrl == null ? null : `\n    <projectUrl>${projectUrl}</projectUrl>`,
       copyright: appInfo.copyright,
       packageCompressionLevel: parseInt((process.env.ELECTRON_BUILDER_COMPRESSION_LEVEL || packager.compression === "store" ? 0 : 9) as any, 10),
-      vendorPath: await getBinFromUrl("Squirrel.Windows", "1.9.0", "zJHk4CMATM7jHJ2ojRH1n3LkOnaIezDk5FAzJmlSEQSiEdRuB4GGLCegLDtsRCakfHIVfKh3ysJHLjynPkXwhQ=="),
+      vendorDirectory,
+      nuspecTemplate: path.join(__dirname, "..", "template.nuspectemplate"),
       ...(this.options as any),
     }
 
+    if (await (await packager.signingManager.value).cscInfo.value) {
+      options.windowsSign = {
+        hookFunction: async (file: string) => {
+          await packager.sign(file)
+        },
+      }
+    }
+
     if (isEmptyOrSpaces(options.description)) {
-      options.description = options.productName
+      options.description = this.options.name || appInfo.productName
     }
 
     if (options.remoteToken == null) {