fix: Cannot find module 'electron-download-tf'

Close #2550
electron-userland · Feb 6, 2018 · c57c52a · c57c52a
1 parent 22ee3e9
commit c57c52a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/packages/electron-builder-lib/src/index.ts b/packages/electron-builder-lib/src/index.ts
@@ -1,10 +1,8 @@
-import { CancellationToken } from "builder-util-runtime"
 import { executeFinally } from "builder-util/out/promise"
 import { PublishOptions } from "electron-publish/out/publisher"
 import { log } from "builder-util"
 import { Packager } from "./packager"
 import { PackagerOptions } from "./packagerApi"
-import BluebirdPromise from "bluebird-lst"
 import { PublishManager } from "./publish/PublishManager"
 
 export { Packager, BuildResult } from "./packager"
@@ -32,17 +30,7 @@ export { PublishManager } from "./publish/PublishManager"
 export { PlatformPackager } from "./platformPackager"
 export { buildForge, ForgeOptions } from "./forge-maker"
 
-export async function build(options: PackagerOptions & PublishOptions, cancellationToken: CancellationToken = new CancellationToken()): Promise<Array<string>> {
-  const packager = new Packager(options, cancellationToken)
-
-  let electronDownloader: any = null
-  packager.electronDownloader = options => {
-    if (electronDownloader ==  null) {
-      electronDownloader = BluebirdPromise.promisify(require("electron-download-tf"))
-    }
-    return electronDownloader(options)
-  }
-
+export async function build(options: PackagerOptions & PublishOptions, packager: Packager = new Packager(options)): Promise<Array<string>> {
   // because artifact event maybe dispatched several times for different publish providers
   const artifactPaths = new Set<string>()
   packager.artifactCreated(event => {
@@ -54,7 +42,7 @@ export async function build(options: PackagerOptions & PublishOptions, cancellat
   const publishManager = new PublishManager(packager, options)
   const sigIntHandler = () => {
     log.warn("cancelled by SIGINT")
-    cancellationToken.cancel()
+    packager.cancellationToken.cancel()
     publishManager.cancelTasks()
   }
   process.once("SIGINT", sigIntHandler)

diff --git a/packages/electron-builder/src/builder.ts b/packages/electron-builder/src/builder.ts
@@ -1,7 +1,8 @@
 import { addValue, Arch, archFromString, InvalidConfigurationError, log, deepAssign } from "builder-util"
 import chalk from "chalk"
-import { build as _build, Configuration, DIR_TARGET, PackagerOptions, Platform } from "electron-builder-lib"
+import { Packager, build as _build, Configuration, DIR_TARGET, PackagerOptions, Platform } from "electron-builder-lib"
 import { PublishOptions } from "electron-publish"
+import BluebirdPromise from "bluebird-lst"
 
 /** @internal */
 export interface BuildOptions extends PackagerOptions, PublishOptions {
@@ -214,7 +215,17 @@ export function createTargets(platforms: Array<Platform>, type?: string | null,
 }
 
 export function build(rawOptions?: CliOptions): Promise<Array<string>> {
-  return _build(normalizeOptions(rawOptions || {}))
+  const buildOptions = normalizeOptions(rawOptions || {})
+  const packager = new Packager(buildOptions)
+
+  let electronDownloader: any = null
+  packager.electronDownloader = options => {
+    if (electronDownloader == null) {
+      electronDownloader = BluebirdPromise.promisify(require("electron-download-tf"))
+    }
+    return electronDownloader(options)
+  }
+  return _build(buildOptions, packager)
 }
 
 /**

diff --git a/test/src/helpers/checkDeps.ts b/test/src/helpers/checkDeps.ts
@@ -49,8 +49,8 @@ async function check(projectDir: string, devPackageData: any): Promise<boolean>
   }
 
   for (const name of Object.keys(result.missing)) {
-    if (name === "electron-builder-squirrel-windows" || name === "electron-webpack" || name === "electron-download-tf" ||
-      (packageName === "electron-builder-lib" && name === "dmg-builder")) {
+    if (name === "electron-builder-squirrel-windows" || name === "electron-webpack" ||
+      (packageName === "electron-builder-lib" && (name === "dmg-builder" || name === "electron-download-tf"))) {
       delete (result.missing as any)[name]
     }
   }