From a33e0045e2c14d7e47a54ce1f5250bfdfb921800 Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Thu, 20 Oct 2016 08:12:52 +0200
Subject: [PATCH] perf: lazy imports, get rid of tsAwaiter

---
 .idea/dictionaries/develar.xml                |   1 +
 .idea/electron-builder.iml                    |   2 +
 .../ArtifactPublisherTest.xml                 |   2 +-
 .idea/runConfigurations/compile.xml           |  12 +
 .idea/runConfigurations/lint.xml              |  12 +
 .idea/runConfigurations/test.xml              |  12 +
 .idea/typescript-compiler.xml                 |   5 +-
 nsis-auto-updater/package.json                |   2 +-
 nsis-auto-updater/src/BintrayProvider.ts      |   3 -
 nsis-auto-updater/src/NsisUpdater.ts          |  16 +-
 nsis-auto-updater/tsconfig.json               |  15 +-
 package.json                                  |  35 +--
 src/appInfo.ts                                |   5 +-
 src/asarUtil.ts                               |  89 ++++---
 src/build-cli.ts                              |   2 +-
 src/builder.ts                                |   5 +-
 src/cleanup.ts                                |   5 +-
 src/cliOptions.ts                             |   2 +-
 src/codeSign.ts                               |   5 +-
 src/install-app-deps.ts                       |   7 +-
 src/linuxPackager.ts                          |   5 +-
 src/macPackager.ts                            |   5 +-
 src/node-gyp-rebuild.ts                       |   5 +-
 src/packager.ts                               |   9 +-
 src/packager/dirPackager.ts                   |   5 +-
 src/packager/mac.ts                           |   7 +-
 src/platformPackager.ts                       |   5 +-
 src/publish/BintrayPublisher.ts               |   5 +-
 src/publish/gitHubPublisher.ts                |   7 +-
 src/publish/restApiRequest.ts                 |   5 +-
 src/publish/uploader.ts                       |   4 +-
 src/repositoryInfo.ts                         |   3 -
 src/targets/LinuxTargetHelper.ts              |   5 +-
 src/targets/appImage.ts                       |   5 +-
 src/targets/archive.ts                        |   3 -
 src/targets/dmg.ts                            |   5 +-
 src/targets/fpm.ts                            |   5 +-
 src/targets/nsis.ts                           |   9 +-
 src/targets/squirrelPack.ts                   |   5 +-
 src/targets/squirrelWindows.ts                |   3 -
 src/util/awaiter.ts                           |  11 -
 src/util/binDownload.ts                       |   5 +-
 src/util/filter.ts                            |   5 +-
 src/util/httpRequest.ts                       |   5 +-
 src/util/log.ts                               |   4 +-
 src/util/promise.ts                           |   5 +-
 src/util/readPackageJson.ts                   |   3 -
 src/util/tmp.ts                               |   5 +-
 src/util/util.ts                              |  17 +-
 src/winPackager.ts                            |   5 +-
 src/windowsCodeSign.ts                        |   4 +-
 test/src/ArtifactPublisherTest.ts             |   8 +-
 test/src/BuildTest.ts                         |   5 +-
 test/src/CodeSignTest.ts                      |   3 -
 test/src/RepoSlugTest.ts                      |   5 +-
 test/src/globTest.ts                          |   7 +-
 test/src/helpers/expectedContents.ts          |   2 +-
 test/src/helpers/fileAssert.ts                |   3 -
 test/src/helpers/packTester.ts                |   7 +-
 test/src/helpers/runTests.ts                  |  12 +-
 test/src/helpers/wine.ts                      |   7 +-
 test/src/httpRequestTest.ts                   |   3 -
 test/src/linuxPackagerTest.ts                 |   3 -
 test/src/macPackagerTest.ts                   |   8 +-
 test/src/nsisTest.ts                          |   5 +-
 test/src/nsisUpdaterTest.ts                   |   5 +-
 test/src/winPackagerTest.ts                   |   5 +-
 test/tsconfig.json                            |  14 +-
 test/typings/decompress-zip.d.ts              |   2 +-
 tsconfig.json                                 |  23 +-
 tslint.json                                   |   5 +-
 typings/chalk.d.ts                            | 219 +++++++++---------
 typings/debug.d.ts                            |  13 ++
 typings/lib.es2016.array.include.d.ts         | 107 +--------
 typings/mime.d.ts                             |  21 ++
 typings/path-sort.d.ts                        |   2 +-
 typings/pretty-ms.d.ts                        |   2 +-
 typings/progress-stream.d.ts                  |   2 +-
 typings/progress.d.ts                         | 115 +++++++++
 typings/sanitize-filename.d.ts                |   2 +-
 typings/semver.d.ts                           | 175 ++++++++++++++
 typings/updateNotifier.d.ts                   |   2 +-
 typings/yargs.d.ts                            |   2 +-
 yarn.lock                                     |  89 +++----
 84 files changed, 704 insertions(+), 590 deletions(-)
 create mode 100644 .idea/runConfigurations/compile.xml
 create mode 100644 .idea/runConfigurations/lint.xml
 create mode 100644 .idea/runConfigurations/test.xml
 delete mode 100644 src/util/awaiter.ts
 create mode 100644 typings/debug.d.ts
 create mode 100644 typings/mime.d.ts
 create mode 100644 typings/progress.d.ts
 create mode 100644 typings/semver.d.ts

diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml
index 1c07cfcd61f..640b20b1ebd 100644
--- a/.idea/dictionaries/develar.xml
+++ b/.idea/dictionaries/develar.xml
@@ -123,6 +123,7 @@
       <w>rels</w>
       <w>repos</w>
       <w>rimraf</w>
+      <w>scripthost</w>
       <w>semver</w>
       <w>shorthash</w>
       <w>signcode</w>
diff --git a/.idea/electron-builder.iml b/.idea/electron-builder.iml
index 86576276fb4..bac7a39926f 100644
--- a/.idea/electron-builder.iml
+++ b/.idea/electron-builder.iml
@@ -3,8 +3,10 @@
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/nsis-auto-updater/node_modules" />
       <excludeFolder url="file://$MODULE_DIR$/nsis-auto-updater/out" />
       <excludeFolder url="file://$MODULE_DIR$/out" />
+      <excludeFolder url="file://$MODULE_DIR$/test-out" />
       <excludeFolder url="file://$MODULE_DIR$/test/fixtures/app-executable-deps/app/node_modules" />
       <excludeFolder url="file://$MODULE_DIR$/test/fixtures/app-executable-deps/dist" />
       <excludeFolder url="file://$MODULE_DIR$/test/fixtures/app-executable-deps/node_modules" />
diff --git a/.idea/runConfigurations/ArtifactPublisherTest.xml b/.idea/runConfigurations/ArtifactPublisherTest.xml
index 5705e49b0a6..78bee45d503 100644
--- a/.idea/runConfigurations/ArtifactPublisherTest.xml
+++ b/.idea/runConfigurations/ArtifactPublisherTest.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ArtifactPublisherTest" type="NodeJSConfigurationType" factoryName="Node.js" singleton="true" path-to-node="project" path-to-js-file="node_modules/.bin/ava" application-parameters="test/out/ArtifactPublisherTest.js" node-parameters="--harmony_default_parameters" working-dir="$PROJECT_DIR$">
+  <configuration default="false" name="ArtifactPublisherTest" type="NodeJSConfigurationType" factoryName="Node.js" singleton="true" path-to-node="/usr/local/bin/node-nightly" path-to-js-file="node_modules/.bin/ava" application-parameters="test/out/ArtifactPublisherTest.js" working-dir="$PROJECT_DIR$">
     <envs>
       <env name="NODE_PATH" value="." />
     </envs>
diff --git a/.idea/runConfigurations/compile.xml b/.idea/runConfigurations/compile.xml
new file mode 100644
index 00000000000..03a53acba8c
--- /dev/null
+++ b/.idea/runConfigurations/compile.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="compile" type="js.build_tools.npm" factoryName="npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run-script" />
+    <scripts>
+      <script value="compile" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/lint.xml b/.idea/runConfigurations/lint.xml
new file mode 100644
index 00000000000..b7a16b56f31
--- /dev/null
+++ b/.idea/runConfigurations/lint.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lint" type="js.build_tools.npm" factoryName="npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run-script" />
+    <scripts>
+      <script value="lint" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/test.xml b/.idea/runConfigurations/test.xml
new file mode 100644
index 00000000000..a3741d716ed
--- /dev/null
+++ b/.idea/runConfigurations/test.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test" type="js.build_tools.npm" factoryName="npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run-script" />
+    <scripts>
+      <script value="test" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/typescript-compiler.xml b/.idea/typescript-compiler.xml
index c3d4bcaacbb..28cd417d9a3 100644
--- a/.idea/typescript-compiler.xml
+++ b/.idea/typescript-compiler.xml
@@ -2,10 +2,9 @@
 <project version="4">
   <component name="TypeScriptCompiler">
     <option name="isCompilerEnabled" value="true" />
-    <option name="typeScriptServiceDirectory" value="$PROJECT_DIR$/node_modules/typescript/lib" />
     <option name="trackFileSystemChanges" value="false" />
     <option name="useConfig" value="true" />
-    <option name="useService" value="true" />
-    <option name="versionType" value="SERVICE_DIRECTORY" />
+    <option name="useServiceCompletion" value="false" />
+    <option name="versionType" value="EMBEDDED" />
   </component>
 </project>
\ No newline at end of file
diff --git a/nsis-auto-updater/package.json b/nsis-auto-updater/package.json
index 290fbc311da..53b25526dbf 100644
--- a/nsis-auto-updater/package.json
+++ b/nsis-auto-updater/package.json
@@ -13,7 +13,7 @@
   ],
   "dependencies": {
     "bluebird": "^3.4.6",
-    "fs-extra-p": "^1.1.10",
+    "fs-extra-p": "^1.2.0",
     "ini": "^1.3.4",
     "semver": "^5.3.0",
     "source-map-support": "^0.4.5",
diff --git a/nsis-auto-updater/src/BintrayProvider.ts b/nsis-auto-updater/src/BintrayProvider.ts
index e93e8f2ddc4..cbc9302593a 100644
--- a/nsis-auto-updater/src/BintrayProvider.ts
+++ b/nsis-auto-updater/src/BintrayProvider.ts
@@ -3,9 +3,6 @@ import { BintrayClient } from "../../src/publish/bintray"
 import { HttpError } from "../../src/publish/restApiRequest"
 import { BintrayOptions } from "../../src/options/publishOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../../src/util/awaiter")
-
 export class BintrayProvider implements Provider {
   private client: BintrayClient
 
diff --git a/nsis-auto-updater/src/NsisUpdater.ts b/nsis-auto-updater/src/NsisUpdater.ts
index 91d1acab8a8..b945ef86b74 100644
--- a/nsis-auto-updater/src/NsisUpdater.ts
+++ b/nsis-auto-updater/src/NsisUpdater.ts
@@ -2,16 +2,18 @@ import { EventEmitter } from "events"
 import { spawn } from "child_process"
 import * as path from "path"
 import { tmpdir } from "os"
-import semver = require("semver")
+import { gt as isVersionGreaterThan, valid as parseVersion } from "semver"
 import { download } from "../../src/util/httpRequest"
 import { Provider, UpdateCheckResult } from "./api"
 import { BintrayProvider } from "./BintrayProvider"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { BintrayOptions, PublishConfiguration, GithubOptions } from "../../src/options/publishOptions"
 import { readJson } from "fs-extra-p"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../../src/util/awaiter")
+BluebirdPromise.config({
+  longStackTraces: true,
+  cancellation: true
+})
 
 export class NsisUpdater extends EventEmitter {
   private setupPath: string | null
@@ -60,17 +62,17 @@ export class NsisUpdater extends EventEmitter {
     const client = await this.clientPromise
     const versionInfo = await client.getLatestVersion()
 
-    const latestVersion = semver.valid(versionInfo.version)
+    const latestVersion = parseVersion(versionInfo.version)
     if (latestVersion == null) {
       throw new Error(`Latest version (from update server) is not valid semver version: "${latestVersion}`)
     }
 
-    const currentVersion = semver.valid(this.app.getVersion())
+    const currentVersion = parseVersion(this.app.getVersion())
     if (currentVersion == null) {
       throw new Error(`App version is not valid semver version: "${currentVersion}`)
     }
 
-    if (semver.gte(currentVersion, latestVersion)) {
+    if (isVersionGreaterThan(currentVersion, latestVersion)) {
       this.updateAvailable = false
       this.emit("update-not-available")
       return {
diff --git a/nsis-auto-updater/tsconfig.json b/nsis-auto-updater/tsconfig.json
index 7996b382db6..13ba9c7013a 100755
--- a/nsis-auto-updater/tsconfig.json
+++ b/nsis-auto-updater/tsconfig.json
@@ -1,11 +1,10 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
+    "module": "es2015",
+    "target": "es2017",
     "noImplicitAny": true,
     "outDir": "out",
     "newLine": "LF",
-    "noResolve": true,
     "noEmitOnError": true,
     "inlineSources": true,
     "sourceMap": true,
@@ -20,20 +19,16 @@
     "": "../test/typings/electron-auto-updater.d.ts"
   },
   "files": [
+    "../typings/semver.d.ts",
     "../node_modules/@types/node/index.d.ts",
-    "../node_modules/@types/semver/index.d.ts",
     "../node_modules/fs-extra-p/index.d.ts",
-    "../node_modules/fs-extra-p/bluebird.d.ts",
+    "../node_modules/@develar/types/bluebird.d.ts",
     "../src/util/httpRequest.ts",
     "../src/publish/restApiRequest.ts",
     "../src/publish/restApiRequest.ts",
-    "../src/publish/bintray.ts",
-    "../src/options/publishOptions.ts",
-    "../src/util/awaiter.ts"
+    "../src/publish/bintray.ts"
   ],
   "include": [
     "src/**/*.ts"
-  ],
-  "exclude": [
   ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 48bb5daa23d..12f396e5156 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,7 @@
     "node-gyp-rebuild": "./out/node-gyp-rebuild.js"
   },
   "scripts": {
-    "compile": "npm run compile-production && npm run compile-updater && npm run compile-test",
-    "compile-production": "ts-babel",
-    "compile-test": "ts-babel test",
-    "compile-updater": "ts-babel nsis-auto-updater",
+    "compile": "ts-babel . nsis-auto-updater test",
     "lint": "tslint 'src/**/*.ts' 'test/src/**/*.ts' 'nsis-auto-updater/src/**/*.ts'",
     "pretest": "npm run compile && npm run lint && npm run pack-updater",
     "test": "node ./test/out/helpers/runTests.js",
@@ -59,7 +56,7 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
-    "7zip-bin": "^2.0.3",
+    "7zip-bin": "^2.0.4",
     "ansi-escapes": "^1.4.0",
     "archiver": "^1.1.0",
     "archiver-utils": "^1.3.0",
@@ -71,14 +68,15 @@
     "cuint": "^0.2.2",
     "debug": "^2.2.0",
     "electron-download": "2.1.2",
-    "electron-osx-sign-tf": "^1.0.0",
-    "fs-extra-p": "^1.1.10",
+    "electron-osx-sign-tf": "^1.0.1",
+    "fs-extra-p": "^1.2.0",
     "hosted-git-info": "^2.1.5",
     "ini": "^1.3.4",
     "isbinaryfile": "^3.0.1",
     "lodash.template": "^4.4.0",
     "mime": "^1.3.4",
     "minimatch": "^3.0.3",
+    "nodent-runtime": "^3.0.1",
     "normalize-package-data": "^2.3.5",
     "parse-color": "^1.0.0",
     "plist": "^2.0.1",
@@ -95,14 +93,13 @@
     "yargs": "^6.0.0"
   },
   "devDependencies": {
+    "@develar/babel-plugin-transform-inline-imports-commonjs": "^1.0.0",
     "@develar/semantic-release": "^6.3.6",
-    "@types/debug": "0.0.29",
-    "@types/mime": "0.0.29",
-    "@types/progress": "^1.1.28",
-    "@types/semver": "^5.3.30",
+    "@develar/types": "^1.0.1",
     "@types/source-map-support": "^0.2.28",
-    "ava-tf": "^0.16.2",
+    "ava-tf": "^0.16.4",
     "babel-plugin-array-includes": "^2.0.3",
+    "babel-plugin-transform-async-to-module-method": "^6.16.0",
     "babel-plugin-transform-es2015-destructuring": "^6.16.0",
     "babel-plugin-transform-es2015-parameters": "^6.17.0",
     "babel-plugin-transform-es2015-spread": "^6.8.0",
@@ -111,18 +108,26 @@
     "husky": "^0.11.9",
     "json8": "^0.9.2",
     "path-sort": "^0.1.0",
-    "ts-babel": "^1.0.13",
+    "ts-babel": "^1.1.2",
     "tslint": "^3.15.1",
-    "typescript": "^2.0.3",
+    "typescript": "^2.1.0-dev.20161019",
     "validate-commit-msg": "^2.8.2",
     "whitespace": "^2.1.0"
   },
   "babel": {
     "plugins": [
+      [
+        "transform-async-to-module-method",
+        {
+          "module": "bluebird",
+          "method": "coroutine"
+        }
+      ],
       "transform-es2015-parameters",
       "transform-es2015-spread",
       "transform-es2015-destructuring",
-      "array-includes"
+      "array-includes",
+      "@develar/babel-plugin-transform-inline-imports-commonjs"
     ]
   },
   "ava": {
diff --git a/src/appInfo.ts b/src/appInfo.ts
index dad7eea84ea..58555e4d971 100644
--- a/src/appInfo.ts
+++ b/src/appInfo.ts
@@ -3,10 +3,7 @@ import { warn } from "./util/log"
 import { smarten } from "./platformPackager"
 import { isEmptyOrSpaces } from "./util/util"
 import { getRepositoryInfo } from "./repositoryInfo"
-import sanitizeFileName = require("sanitize-filename")
-
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
+import sanitizeFileName from "sanitize-filename"
 
 export class AppInfo {
   readonly description = smarten(this.metadata.description!)
diff --git a/src/asarUtil.ts b/src/asarUtil.ts
index a1412ab3004..036ba39ba6b 100644
--- a/src/asarUtil.ts
+++ b/src/asarUtil.ts
@@ -4,7 +4,7 @@ import {
   lstat, readdir, readFile, Stats, createWriteStream, ensureDir, createReadStream, readJson,
   writeFile, realpath
 } from "fs-extra-p"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 import { log } from "./util/log"
 import { Minimatch } from "minimatch"
@@ -16,62 +16,57 @@ const pickle = require ("chromium-pickle-js")
 const Filesystem = require("asar-electron-builder/lib/filesystem")
 const UINT64 = require("cuint").UINT64
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 const MAX_FILE_REQUESTS = 32
 const concurrency = {concurrency: MAX_FILE_REQUESTS}
 const NODE_MODULES_PATTERN = path.sep + "node_modules" + path.sep
 
-export function walk(dirPath: string, consumer?: (file: string, stat: Stats) => void, filter?: Filter, addRootToResult?: boolean): BluebirdPromise<Array<string>> {
-  return readdir(dirPath)
-    .then(names => BluebirdPromise.map(names, name => {
-      const filePath = dirPath + path.sep + name
-      return lstat(filePath)
-        .then((stat): any => {
-          if (filter != null && !filter(filePath, stat)) {
-            return null
-          }
-
-          if (consumer != null) {
-            consumer(filePath, stat)
-          }
-          if (stat.isDirectory()) {
-            return walk(filePath, consumer, filter, true)
-          }
-          return filePath
-        })
-    }, concurrency))
-    .then(list => {
-      list.sort((a, b) => {
-        // files before directories
-        if (Array.isArray(a) && Array.isArray(b)) {
-          return 0
+export async function walk(dirPath: string, consumer?: (file: string, stat: Stats) => void, filter?: Filter, addRootToResult?: boolean): Promise<Array<string>> {
+  const list = await BluebirdPromise.map(await readdir(dirPath), name => {
+    const filePath = dirPath + path.sep + name
+    return lstat(filePath)
+      .then((stat): any => {
+        if (filter != null && !filter(filePath, stat)) {
+          return null
         }
-        else if (a == null || Array.isArray(a)) {
-          return 1
-        }
-        else if (b == null || Array.isArray(b)) {
-          return -1
+
+        if (consumer != null) {
+          consumer(filePath, stat)
         }
-        else {
-          return a.localeCompare(b)
+        if (stat.isDirectory()) {
+          return walk(filePath, consumer, filter, true)
         }
+        return filePath
       })
+  }, concurrency)
 
-      const result: Array<string> = addRootToResult ? [dirPath] : []
-      for (let item of list) {
-        if (item != null) {
-          if (Array.isArray(item)) {
-            result.push.apply(result, item)
-          }
-          else {
-            result.push(item)
-          }
-        }
+  list.sort((a, b) => {
+    // files before directories
+    if (Array.isArray(a) && Array.isArray(b)) {
+      return 0
+    }
+    else if (a == null || Array.isArray(a)) {
+      return 1
+    }
+    else if (b == null || Array.isArray(b)) {
+      return -1
+    }
+    else {
+      return a.localeCompare(b)
+    }
+  })
+
+  const result: Array<string> = addRootToResult ? [dirPath] : []
+  for (let item of list) {
+    if (item != null) {
+      if (Array.isArray(item)) {
+        result.push.apply(result, item)
       }
-      return result
-    })
+      else {
+        result.push(item)
+      }
+    }
+  }
+  return result
 }
 
 export async function createAsarArchive(src: string, resourcesPath: string, options: AsarOptions, filter: Filter): Promise<any> {
diff --git a/src/build-cli.ts b/src/build-cli.ts
index 3c61f37e13d..07c785d6dc6 100644
--- a/src/build-cli.ts
+++ b/src/build-cli.ts
@@ -7,7 +7,7 @@ import { readJson } from "fs-extra-p"
 import * as path from "path"
 import { dim, reset, green, cyan } from "chalk"
 
-import updateNotifier = require("update-notifier")
+import updateNotifier from "update-notifier"
 import { warn } from "./util/log"
 
 if (process.env.CI == null && process.env.NO_UPDATE_NOTIFIER == null) {
diff --git a/src/builder.ts b/src/builder.ts
index 479fdc9635a..e779a9262a6 100644
--- a/src/builder.ts
+++ b/src/builder.ts
@@ -3,7 +3,7 @@ import { PackagerOptions, getPublishConfigs, getResolvedPublishConfig } from "./
 import { PublishOptions, Publisher } from "./publish/publisher"
 import { GitHubPublisher } from "./publish/gitHubPublisher"
 import { executeFinally } from "./util/promise"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { isEmptyOrSpaces, isCi, debug } from "./util/util"
 import { log } from "./util/log"
 import { Platform, Arch, archFromString } from "./metadata"
@@ -11,9 +11,6 @@ import { DIR_TARGET } from "./targets/targetFactory"
 import { BintrayPublisher } from "./publish/BintrayPublisher"
 import { PublishConfiguration, GithubOptions, BintrayOptions } from "./options/publishOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export interface BuildOptions extends PackagerOptions, PublishOptions {
 }
 
diff --git a/src/cleanup.ts b/src/cleanup.ts
index ae07eb0a900..cdbdc361efa 100644
--- a/src/cleanup.ts
+++ b/src/cleanup.ts
@@ -2,12 +2,9 @@
 
 import { homedir } from "os"
 import { readdir, lstat, Stats, remove, readFile } from "fs-extra-p"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 async function main() {
   const dir = path.join(homedir(), ".cache", "fpm")
   let items: string[] | null = null
diff --git a/src/cliOptions.ts b/src/cliOptions.ts
index c0fe95c8be8..b063e6e2c16 100644
--- a/src/cliOptions.ts
+++ b/src/cliOptions.ts
@@ -1,5 +1,5 @@
 import { underline } from "chalk"
-import yargs = require("yargs")
+import yargs from "yargs"
 
 const publishGroup = "Publishing:"
 const buildGroup = "Building:"
diff --git a/src/codeSign.ts b/src/codeSign.ts
index 084e5526129..ffe2038a756 100644
--- a/src/codeSign.ts
+++ b/src/codeSign.ts
@@ -3,14 +3,11 @@ import { deleteFile, outputFile, copy, rename } from "fs-extra-p"
 import { download } from "./util/httpRequest"
 import * as path from "path"
 import { executeFinally, all } from "./util/promise"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { randomBytes } from "crypto"
 import { homedir } from "os"
 import { TmpDir } from "./util/tmp"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 const appleCertificatePrefixes = ["Developer ID Application:", "3rd Party Mac Developer Application:", "Developer ID Installer:", "3rd Party Mac Developer Installer:"]
 
 export type CertType = "Developer ID Application" | "3rd Party Mac Developer Application" | "Developer ID Installer" | "3rd Party Mac Developer Installer"
diff --git a/src/install-app-deps.ts b/src/install-app-deps.ts
index fc7c856c913..ed2675c9fca 100644
--- a/src/install-app-deps.ts
+++ b/src/install-app-deps.ts
@@ -3,14 +3,11 @@
 import { computeDefaultAppDirectory, installDependencies, getElectronVersion, use } from "./util/util"
 import { printErrorAndExit } from "./util/promise"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { DevMetadata } from "./metadata"
-import yargs = require("yargs")
+import yargs from "yargs"
 import { readPackageJson } from "./util/readPackageJson"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 const args: any = yargs
   .option("arch", {
     choices: ["ia32", "x64", "all"],
diff --git a/src/linuxPackager.ts b/src/linuxPackager.ts
index 68a55105b2e..4f690021890 100755
--- a/src/linuxPackager.ts
+++ b/src/linuxPackager.ts
@@ -1,5 +1,5 @@
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { PlatformPackager, BuildInfo, Target, TargetEx } from "./platformPackager"
 import { Platform, LinuxBuildOptions, Arch } from "./metadata"
 import FpmTarget from "./targets/fpm"
@@ -8,9 +8,6 @@ import { LinuxTargetHelper } from "./targets/LinuxTargetHelper"
 import AppImageTarget from "./targets/appImage"
 import { rename } from "fs-extra-p"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export class LinuxPackager extends PlatformPackager<LinuxBuildOptions> {
   constructor(info: BuildInfo) {
     super(info)
diff --git a/src/macPackager.ts b/src/macPackager.ts
index 8f8557569d7..d7b7ad573e6 100644
--- a/src/macPackager.ts
+++ b/src/macPackager.ts
@@ -2,7 +2,7 @@ import { PlatformPackager, BuildInfo, Target } from "./platformPackager"
 import { Platform, Arch } from "./metadata"
 import { MasBuildOptions, MacOptions } from "./options/macOptions"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { log, warn, task } from "./util/log"
 import { createKeychain, CodeSigningInfo, findIdentity } from "./codeSign"
 import { deepAssign } from "./util/deepAssign"
@@ -11,9 +11,6 @@ import { DmgTarget } from "./targets/dmg"
 import { createCommonTarget, DEFAULT_TARGET } from "./targets/targetFactory"
 import { AppInfo } from "./appInfo"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export default class MacPackager extends PlatformPackager<MacOptions> {
   codeSigningInfo: Promise<CodeSigningInfo>
 
diff --git a/src/node-gyp-rebuild.ts b/src/node-gyp-rebuild.ts
index 87dd1f55a1e..6a91dedb7be 100644
--- a/src/node-gyp-rebuild.ts
+++ b/src/node-gyp-rebuild.ts
@@ -3,13 +3,10 @@
 import { getElectronVersion, exec, getGypEnv } from "./util/util"
 import { printErrorAndExit } from "./util/promise"
 import * as path from "path"
-import yargs = require("yargs")
+import yargs from "yargs"
 import { readPackageJson } from "./util/readPackageJson"
 import { log } from "./util/log"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 const args: any = yargs
   .option("arch", {
     choices: ["ia32", "x64", "armv7l"],
diff --git a/src/packager.ts b/src/packager.ts
index af389e390bb..9c3c1e4762c 100644
--- a/src/packager.ts
+++ b/src/packager.ts
@@ -5,14 +5,14 @@ import {
 } from "./util/util"
 import { all, executeFinally } from "./util/promise"
 import { EventEmitter } from "events"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { AppMetadata, DevMetadata, Platform, Arch } from "./metadata"
 import { PlatformPackager, BuildInfo, ArtifactCreated, Target } from "./platformPackager"
 import { WinPackager } from "./winPackager"
 import * as errorMessages from "./errorMessages"
 import * as util from "util"
 import { deepAssign } from "./util/deepAssign"
-import semver = require("semver")
+import { lt as isVersionLessThan } from "semver"
 import { warn, log } from "./util/log"
 import { AppInfo } from "./appInfo"
 import MacPackager from "./macPackager"
@@ -21,9 +21,6 @@ import { readPackageJson } from "./util/readPackageJson"
 import { TmpDir } from "./util/tmp"
 import { BuildOptions } from "./builder"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 function addHandler(emitter: EventEmitter, event: string, handler: Function) {
   emitter.on(event, handler)
 }
@@ -304,7 +301,7 @@ async function checkWineVersion(checkPromise: Promise<string>) {
     wineVersion += ".0"
   }
 
-  if (semver.lt(wineVersion, "1.8.0")) {
+  if (isVersionLessThan(wineVersion, "1.8.0")) {
     throw new Error(wineError(`wine 1.8+ is required, but your version is ${wineVersion}`))
   }
 }
diff --git a/src/packager/dirPackager.ts b/src/packager/dirPackager.ts
index d90ebb58d72..2c4a652c952 100644
--- a/src/packager/dirPackager.ts
+++ b/src/packager/dirPackager.ts
@@ -1,4 +1,4 @@
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { emptyDir, copy, chmod } from "fs-extra-p"
 import { warn } from "../util/log"
 import { PlatformPackager } from "../platformPackager"
@@ -8,9 +8,6 @@ import * as path from "path"
 
 const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("electron-download"))
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 function createDownloadOpts(opts: any, platform: string, arch: string, electronVersion: string) {
   const downloadOpts = Object.assign({
     cache: opts.cache,
diff --git a/src/packager/mac.ts b/src/packager/mac.ts
index aae4f2acd25..e21361256a5 100644
--- a/src/packager/mac.ts
+++ b/src/packager/mac.ts
@@ -1,14 +1,11 @@
 import { rename, readFile, writeFile, copy, unlink } from "fs-extra-p"
 import * as path from "path"
 import { parse as parsePlist, build as buildPlist } from "plist"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { use, asArray } from "../util/util"
 import { normalizeExt, PlatformPackager } from "../platformPackager"
 import { warn } from "../util/log"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 function doRename (basePath: string, oldName: string, newName: string) {
   return rename(path.join(basePath, oldName), path.join(basePath, newName))
 }
@@ -43,7 +40,7 @@ export async function createApp(packager: PlatformPackager<any>, appOutDir: stri
 
   const result = await BluebirdPromise.all<any | n>([
     initializeApp(),
-    BluebirdPromise.map<any | null>([appPlistFilename, helperPlistFilename, helperEHPlistFilename, helperNPPlistFilename, (<any>buildMetadata)["extend-info"]], it => it == null ? it : readFile(it, "utf8"))
+    BluebirdPromise.map([appPlistFilename, helperPlistFilename, helperEHPlistFilename, helperNPPlistFilename, (<any>buildMetadata)["extend-info"]], it => it == null ? it : readFile(it, "utf8"))
   ])
   const fileContents: Array<string> = result[1]!
   const appPlist = parsePlist(fileContents[0])
diff --git a/src/platformPackager.ts b/src/platformPackager.ts
index 630ad6f742a..45c5ee90e09 100644
--- a/src/platformPackager.ts
+++ b/src/platformPackager.ts
@@ -1,6 +1,6 @@
 import { AppMetadata, DevMetadata, Platform, PlatformSpecificBuildOptions, Arch, FileAssociation } from "./metadata"
 import EventEmitter = NodeJS.EventEmitter
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 import { readdir, remove } from "fs-extra-p"
 import { statOrNull, use, unlinkIfExists, isEmptyOrSpaces, asArray } from "./util/util"
@@ -19,9 +19,6 @@ import { BuildOptions } from "./builder"
 import { PublishConfiguration, GithubOptions, BintrayOptions } from "./options/publishOptions"
 import { getRepositoryInfo } from "./repositoryInfo"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export interface PackagerOptions {
   targets?: Map<Platform, Map<Arch, string[]>>
 
diff --git a/src/publish/BintrayPublisher.ts b/src/publish/BintrayPublisher.ts
index 5dbc276d513..db0c6c2724b 100644
--- a/src/publish/BintrayPublisher.ts
+++ b/src/publish/BintrayPublisher.ts
@@ -1,5 +1,5 @@
 import { Publisher, PublishOptions } from "./publisher"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { HttpError, doApiRequest } from "./restApiRequest"
 import { uploadFile } from "./uploader"
 import { log } from "../util/log"
@@ -9,9 +9,6 @@ import { stat } from "fs-extra-p"
 import { BintrayClient, Version } from "./bintray"
 import { BintrayOptions } from "../options/publishOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 export class BintrayPublisher implements Publisher {
   private _versionPromise: BluebirdPromise<Version>
 
diff --git a/src/publish/gitHubPublisher.ts b/src/publish/gitHubPublisher.ts
index 078835bcb04..cbba928c194 100644
--- a/src/publish/gitHubPublisher.ts
+++ b/src/publish/gitHubPublisher.ts
@@ -3,17 +3,14 @@ import { log, warn } from "../util/log"
 import { debug } from "../util/util"
 import { basename } from "path"
 import { parse as parseUrl } from "url"
-import * as mime from "mime"
+import mime from "mime"
 import { stat } from "fs-extra-p"
 import { githubRequest, HttpError, doApiRequest } from "./restApiRequest"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { PublishPolicy, PublishOptions, Publisher } from "./publisher"
 import { uploadFile } from "./uploader"
 import { GithubOptions } from "../options/publishOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 export interface Release {
   id: number
   tag_name: string
diff --git a/src/publish/restApiRequest.ts b/src/publish/restApiRequest.ts
index 527cb6d3e63..66c851bade0 100644
--- a/src/publish/restApiRequest.ts
+++ b/src/publish/restApiRequest.ts
@@ -2,10 +2,7 @@ import * as https from "https"
 import { RequestOptions } from "https"
 import { IncomingMessage, ClientRequest } from "http"
 import { addTimeOutHandler } from "../util/httpRequest"
-import { Promise as BluebirdPromise } from "bluebird"
-
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
+import BluebirdPromise from "bluebird"
 
 export function githubRequest<T>(path: string, token: string | null, data: { [name: string]: any; } | null = null, method: string = "GET"): Promise<T> {
   return request<T>("api.github.com", path, token, data, method)
diff --git a/src/publish/uploader.ts b/src/publish/uploader.ts
index 13a14751654..5983f26166a 100644
--- a/src/publish/uploader.ts
+++ b/src/publish/uploader.ts
@@ -1,5 +1,5 @@
-import progressStream = require("progress-stream")
-import ProgressBar = require("progress")
+import progressStream from "progress-stream"
+import ProgressBar from "progress"
 import { createReadStream, Stats } from "fs-extra-p"
 import { ReadStream } from "tty"
 import { ClientRequest } from "http"
diff --git a/src/repositoryInfo.ts b/src/repositoryInfo.ts
index bc3afd56394..3d478e9c7b6 100644
--- a/src/repositoryInfo.ts
+++ b/src/repositoryInfo.ts
@@ -3,9 +3,6 @@ import { readFile } from "fs-extra-p"
 import { AppMetadata, Metadata } from "./metadata"
 import * as path from "path"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export interface RepositorySlug {
   user: string
   project: string
diff --git a/src/targets/LinuxTargetHelper.ts b/src/targets/LinuxTargetHelper.ts
index 84b313f8392..0518057ec8d 100644
--- a/src/targets/LinuxTargetHelper.ts
+++ b/src/targets/LinuxTargetHelper.ts
@@ -2,12 +2,9 @@ import { readdir, outputFile, ensureDir } from "fs-extra-p"
 import * as path from "path"
 import { exec, debug, isEmptyOrSpaces } from "../util/util"
 import { PlatformPackager } from "../platformPackager"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { LinuxBuildOptions } from "../metadata"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 export const installPrefix = "/opt"
 
 export class LinuxTargetHelper {
diff --git a/src/targets/appImage.ts b/src/targets/appImage.ts
index be81b00f2a7..4c49a834c68 100644
--- a/src/targets/appImage.ts
+++ b/src/targets/appImage.ts
@@ -5,12 +5,9 @@ import { exec, unlinkIfExists } from "../util/util"
 import { open, write, createReadStream, createWriteStream, close, chmod } from "fs-extra-p"
 import { LinuxTargetHelper } from "./LinuxTargetHelper"
 import { getBin } from "../util/binDownload"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { v1 as uuid1 } from "uuid-1345"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 const appImageVersion = process.platform === "darwin" ? "AppImage-09-07-16-mac" : "AppImage-09-07-16-linux"
 //noinspection SpellCheckingInspection
 const appImageSha256 = process.platform === "darwin" ? "5d4a954876654403698a01ef5bd7f218f18826261332e7d31d93ab4432fa0312" : "ac324e90b502f4e995f6a169451dbfc911bb55c0077e897d746838e720ae0221"
diff --git a/src/targets/archive.ts b/src/targets/archive.ts
index 58e7df80531..78c30d5a1bf 100644
--- a/src/targets/archive.ts
+++ b/src/targets/archive.ts
@@ -4,9 +4,6 @@ import * as path from "path"
 import { unlink } from "fs-extra-p"
 import { path7za } from "7zip-bin"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 class CompressionDescriptor {
   constructor(public flag: string, public env: string, public minLevel: string, public maxLevel: string = "-9") {
   }
diff --git a/src/targets/dmg.ts b/src/targets/dmg.ts
index 3b8fce21829..54d5f842670 100644
--- a/src/targets/dmg.ts
+++ b/src/targets/dmg.ts
@@ -3,14 +3,11 @@ import * as path from "path"
 import { log, warn } from "../util/log"
 import { Target, PlatformPackager } from "../platformPackager"
 import { MacOptions, DmgOptions, DmgContent } from "../options/macOptions"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { debug, use, exec, statOrNull, isEmptyOrSpaces } from "../util/util"
 import { copy, unlink, outputFile, remove } from "fs-extra-p"
 import { executeFinally } from "../util/promise"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 export class DmgTarget extends Target {
   private helperDir = path.join(__dirname, "..", "..", "templates", "dmg")
 
diff --git a/src/targets/fpm.ts b/src/targets/fpm.ts
index 1a8de5ce47a..c4081af20d6 100644
--- a/src/targets/fpm.ts
+++ b/src/targets/fpm.ts
@@ -4,16 +4,13 @@ import { use, exec } from "../util/util"
 import * as path from "path"
 import { getBin } from "../util/binDownload"
 import {  readFile, outputFile } from "fs-extra-p"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { LinuxTargetHelper, installPrefix } from "./LinuxTargetHelper"
 import * as errorMessages from "../errorMessages"
 import { TmpDir } from "../util/tmp"
 
 const template = require("lodash.template")
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 const fpmPath = (process.platform === "win32" || process.env.USE_SYSTEM_FPM === "true") ?
   BluebirdPromise.resolve("fpm") : downloadFpm()
 
diff --git a/src/targets/nsis.ts b/src/targets/nsis.ts
index e620eb4d4ce..a047736d8d5 100644
--- a/src/targets/nsis.ts
+++ b/src/targets/nsis.ts
@@ -2,21 +2,18 @@ import { WinPackager } from "../winPackager"
 import { Arch } from "../metadata"
 import { exec, debug, doSpawn, handleProcess, use, asArray } from "../util/util"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { getBinFromBintray } from "../util/binDownload"
 import { v5 as uuid5 } from "uuid-1345"
 import { normalizeExt, TargetEx, getPublishConfigs, getResolvedPublishConfig } from "../platformPackager"
 import { archiveApp } from "./archive"
 import { subTask, task, log } from "../util/log"
 import { unlink, readFile } from "fs-extra-p"
-import semver = require("semver")
+import { SemVer } from "semver"
 import { NsisOptions } from "../options/winOptions"
 import { writeJson } from "fs-extra-p"
 import { PublishConfiguration } from "../options/publishOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 const NSIS_VERSION = "3.0.1"
 //noinspection SpellCheckingInspection
 const NSIS_SHA2 = "23280f66c07c923da6f29a3c318377720c8ecd7af4de3755256d1ecf60d07f74"
@@ -135,7 +132,7 @@ export default class NsisTarget extends TargetEx {
 
     // Error: invalid VIProductVersion format, should be X.X.X.X
     // so, we must strip beta
-    const parsedVersion = new semver.SemVer(appInfo.version)
+    const parsedVersion = new SemVer(appInfo.version)
     const localeId = this.options.language || "1033"
     const versionKey = [
       `/LANG=${localeId} ProductName "${appInfo.productName}"`,
diff --git a/src/targets/squirrelPack.ts b/src/targets/squirrelPack.ts
index 246ad2522d9..ecfed002a4b 100644
--- a/src/targets/squirrelPack.ts
+++ b/src/targets/squirrelPack.ts
@@ -1,5 +1,5 @@
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { remove, copy, createWriteStream, unlink, ensureDir } from "fs-extra-p"
 import { spawn, exec } from "../util/util"
 import { debug } from "../util/util"
@@ -9,9 +9,6 @@ import { log } from "../util/log"
 const archiverUtil = require("archiver-utils")
 const archiver = require("archiver")
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 export function convertVersion(version: string): string {
   const parts = version.split("-")
   const mainVersion = parts.shift()
diff --git a/src/targets/squirrelWindows.ts b/src/targets/squirrelWindows.ts
index 862a0656079..5afd5259cff 100644
--- a/src/targets/squirrelWindows.ts
+++ b/src/targets/squirrelWindows.ts
@@ -8,9 +8,6 @@ import { getBinFromBintray } from "../util/binDownload"
 import { buildInstaller, convertVersion, SquirrelOptions } from "./squirrelPack"
 import { SquirrelWindowsOptions } from "../options/winOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../util/awaiter")
-
 const SW_VERSION = "1.4.4"
 //noinspection SpellCheckingInspection
 const SW_SHA2 = "98e1d81c80d7afc1bcfb37f3b224dc4f761088506b9c28ccd72d1cf8752853ba"
diff --git a/src/util/awaiter.ts b/src/util/awaiter.ts
deleted file mode 100644
index c7d71a4abe6..00000000000
--- a/src/util/awaiter.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Promise as BluebirdPromise } from "bluebird"
-import "source-map-support/register"
-
-BluebirdPromise.config({
-  longStackTraces: true,
-  cancellation: true
-})
-
-export = function tsAwaiter(thisArg: any, _arguments: any, ignored: any, generator: Function) {
-  return BluebirdPromise.coroutine(generator).call(thisArg, _arguments)
-}
diff --git a/src/util/binDownload.ts b/src/util/binDownload.ts
index 7e5638407fe..82c8a3779e0 100644
--- a/src/util/binDownload.ts
+++ b/src/util/binDownload.ts
@@ -4,10 +4,7 @@ import { download } from "./httpRequest"
 import { path7za } from "7zip-bin"
 import * as path from "path"
 import { homedir } from "os"
-import { Promise as BluebirdPromise } from "bluebird"
-
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
+import BluebirdPromise from "bluebird"
 
 const versionToPromise = new Map<string, BluebirdPromise<string>>()
 
diff --git a/src/util/filter.ts b/src/util/filter.ts
index f2cbd7f0e33..07529d24871 100644
--- a/src/util/filter.ts
+++ b/src/util/filter.ts
@@ -1,12 +1,9 @@
 import { copy, Stats } from "fs-extra-p"
 import { Minimatch } from "minimatch"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 const readInstalled = require("read-installed")
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
-
 // we use relative path to avoid canonical path issue - e.g. /tmp vs /private/tmp
 export function copyFiltered(src: string, destination: string, filter: Filter, dereference: boolean): Promise<any> {
   return copy(src, destination, {
diff --git a/src/util/httpRequest.ts b/src/util/httpRequest.ts
index 4179df35fb7..17189a8865b 100644
--- a/src/util/httpRequest.ts
+++ b/src/util/httpRequest.ts
@@ -3,15 +3,12 @@ import { IncomingMessage, ClientRequest, Agent } from "http"
 import * as https from "https"
 import { createWriteStream, ensureDir, readFile } from "fs-extra-p"
 import { parse as parseUrl } from "url"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 import { createHash } from "crypto"
 import { Transform } from "stream"
 import { homedir } from "os"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
-
 const maxRedirects = 10
 
 export interface DownloadOptions {
diff --git a/src/util/log.ts b/src/util/log.ts
index 850e01be9e3..422326e9b15 100644
--- a/src/util/log.ts
+++ b/src/util/log.ts
@@ -1,9 +1,9 @@
 import { yellow, green, blue } from "chalk"
 import WritableStream = NodeJS.WritableStream
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { eraseLines } from "ansi-escapes"
 import * as cursor from "cli-cursor"
-import prettyMs = require("pretty-ms")
+import prettyMs from "pretty-ms"
 
 interface Line {
   // text must be \n terminated
diff --git a/src/util/promise.ts b/src/util/promise.ts
index 6b63293e1e9..d718ea06831 100644
--- a/src/util/promise.ts
+++ b/src/util/promise.ts
@@ -1,9 +1,6 @@
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { red } from "chalk"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
-
 export function printErrorAndExit(error: Error) {
   console.error(red((error.stack || error).toString()))
   process.exit(-1)
diff --git a/src/util/readPackageJson.ts b/src/util/readPackageJson.ts
index 371aa0bd8b2..e9258e2d4ff 100644
--- a/src/util/readPackageJson.ts
+++ b/src/util/readPackageJson.ts
@@ -1,9 +1,6 @@
 import * as path from "path"
 import { readJson, readFile } from "fs-extra-p"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
-
 const normalizeData = require("normalize-package-data")
 
 export async function readPackageJson(file: string): Promise<any> {
diff --git a/src/util/tmp.ts b/src/util/tmp.ts
index aa11db2af34..c61da5db73b 100644
--- a/src/util/tmp.ts
+++ b/src/util/tmp.ts
@@ -2,12 +2,9 @@ import { tmpdir } from "os"
 import { remove, mkdirs, removeSync } from "fs-extra-p"
 import * as path from "path"
 import { getTempName, use } from "./util"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { warn } from "./log"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
-
 const mkdtemp: any | null = use(require("fs").mkdtemp, it => BluebirdPromise.promisify(it))
 
 export class TmpDir {
diff --git a/src/util/util.ts b/src/util/util.ts
index 53e56b8287b..b1cc928d1bd 100644
--- a/src/util/util.ts
+++ b/src/util/util.ts
@@ -1,21 +1,26 @@
 import { execFile, spawn as _spawn, ChildProcess, SpawnOptions } from "child_process"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { homedir } from "os"
 import * as path from "path"
 import { readJson, stat, Stats, unlink } from "fs-extra-p"
 import { yellow, red } from "chalk"
-import debugFactory = require("debug")
+import _debug from "debug"
 import { warn, task, log } from "./log"
 import { createHash } from "crypto"
+import Debugger = debug.Debugger
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./awaiter")
+import "source-map-support/register"
 
-export const debug = debugFactory("electron-builder")
-export const debug7z = debugFactory("electron-builder:7z")
+export const debug: Debugger = _debug("electron-builder")
+export const debug7z: Debugger = _debug("electron-builder:7z")
 
 const DEFAULT_APP_DIR_NAMES = ["app", "www"]
 
+BluebirdPromise.config({
+  longStackTraces: true,
+  cancellation: true
+})
+
 export function installDependencies(appDir: string, electronVersion: string, arch: string = process.arch, forceBuildFromSource: boolean, command: string = "install"): BluebirdPromise<any> {
   return task(`${(command === "install" ? "Installing" : "Rebuilding")} app dependencies for arch ${arch} to ${appDir}`, spawnNpmProduction(command, appDir, forceBuildFromSource, getGypEnv(electronVersion, arch)))
 }
diff --git a/src/winPackager.ts b/src/winPackager.ts
index b3fd0b3dd24..c011d79a768 100644
--- a/src/winPackager.ts
+++ b/src/winPackager.ts
@@ -1,5 +1,5 @@
 import { downloadCertificate } from "./codeSign"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { PlatformPackager, BuildInfo, Target, TargetEx } from "./platformPackager"
 import { Platform, Arch } from "./metadata"
 import * as path from "path"
@@ -13,9 +13,6 @@ import { DEFAULT_TARGET, createCommonTarget, DIR_TARGET } from "./targets/target
 import { rename } from "fs-extra-p"
 import { WinBuildOptions } from "./options/winOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
-
 export interface FileCodeSigningInfo {
   readonly file?: string | null
   readonly password?: string | null
diff --git a/src/windowsCodeSign.ts b/src/windowsCodeSign.ts
index 90310ee6287..8e432df6b4d 100644
--- a/src/windowsCodeSign.ts
+++ b/src/windowsCodeSign.ts
@@ -3,8 +3,6 @@ import { rename } from "fs-extra-p"
 import * as path from "path"
 import { release } from "os"
 import { getBinFromBintray } from "./util/binDownload"
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("./util/awaiter")
 
 const TOOLS_VERSION = "1.4.2"
 
@@ -136,7 +134,7 @@ function getOutputPath(inputPath: string, hash: string) {
   return path.join(path.dirname(inputPath), `${path.basename(inputPath, extension)}-signed-${hash}${extension}`)
 }
 
-async function getToolPath() {
+async function getToolPath(): Promise<string> {
   if (process.env.USE_SYSTEM_SIGNCODE) {
     return "osslsigncode"
   }
diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts
index 9fba4099466..dac241713d9 100644
--- a/test/src/ArtifactPublisherTest.ts
+++ b/test/src/ArtifactPublisherTest.ts
@@ -6,8 +6,12 @@ import { assertThat } from "./helpers/fileAssert"
 import { BintrayPublisher } from "out/publish/BintrayPublisher"
 import { createPublisher } from "out/builder"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
+import BluebirdPromise from "bluebird"
+
+BluebirdPromise.config({
+  longStackTraces: true,
+  cancellation: true
+})
 
 function getRandomInt(min: number, max: number) {
   return Math.floor(Math.random() * (max - min + 1)) + min
diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
index cb628ef3e82..be22b0b6e33 100755
--- a/test/src/BuildTest.ts
+++ b/test/src/BuildTest.ts
@@ -1,7 +1,7 @@
 import test from "./helpers/avaEx"
 import { assertPack, modifyPackageJson, platform, getPossiblePlatforms, app, appThrows, packageJson } from "./helpers/packTester"
 import { move, outputJson } from "fs-extra-p"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 import { assertThat } from "./helpers/fileAssert"
 import { archFromString, BuildOptions, Platform, Arch, PackagerOptions, DIR_TARGET, createTargets } from "out"
@@ -10,9 +10,6 @@ import { createYargs } from "out/cliOptions"
 import { extractFile } from "asar-electron-builder"
 import { ELECTRON_VERSION } from "./helpers/config"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test("cli", () => {
   const yargs = createYargs()
 
diff --git a/test/src/CodeSignTest.ts b/test/src/CodeSignTest.ts
index 846fff49443..ac16002e276 100644
--- a/test/src/CodeSignTest.ts
+++ b/test/src/CodeSignTest.ts
@@ -5,9 +5,6 @@ import { CSC_LINK } from "./helpers/codeSignData"
 import { removePassword } from "out/util/util"
 import { TmpDir } from "out/util/tmp"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 const tmpDir = new TmpDir()
 
 if (process.env.CSC_KEY_PASSWORD == null) {
diff --git a/test/src/RepoSlugTest.ts b/test/src/RepoSlugTest.ts
index a49e5f887af..cf9081de9c6 100644
--- a/test/src/RepoSlugTest.ts
+++ b/test/src/RepoSlugTest.ts
@@ -1,12 +1,9 @@
 import { Info } from "hosted-git-info"
 import { assertThat } from "./helpers/fileAssert"
 import test from "ava-tf"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { getRepositoryInfo } from "out/repositoryInfo"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test("repo slug from TRAVIS_REPO_SLUG", () => {
   const oldValue = process.env.TRAVIS_REPO_SLUG
   try {
diff --git a/test/src/globTest.ts b/test/src/globTest.ts
index 3be5e64ffa7..e1b7a5ae797 100644
--- a/test/src/globTest.ts
+++ b/test/src/globTest.ts
@@ -2,16 +2,13 @@ import test from "./helpers/avaEx"
 import { expectedWinContents } from "./helpers/expectedContents"
 import { outputFile, symlink } from "fs-extra-p"
 import { assertPack, modifyPackageJson, getPossiblePlatforms, app, appThrows } from "./helpers/packTester"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import * as path from "path"
 import { assertThat } from "./helpers/fileAssert"
 import { Platform, DIR_TARGET } from "out"
-import pathSorter = require("path-sort")
+import pathSorter from "path-sort"
 import { statFile } from "asar-electron-builder"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test.ifDevOrLinuxCi("ignore build resources", app({
   targets: Platform.LINUX.createTarget(DIR_TARGET),
   devMetadata: {
diff --git a/test/src/helpers/expectedContents.ts b/test/src/helpers/expectedContents.ts
index 1f994180f6d..5c190a879fa 100755
--- a/test/src/helpers/expectedContents.ts
+++ b/test/src/helpers/expectedContents.ts
@@ -1,4 +1,4 @@
-import pathSorter = require("path-sort")
+import pathSorter from "path-sort"
 
 //noinspection SpellCheckingInspection
 export const expectedLinuxContents = ["/",
diff --git a/test/src/helpers/fileAssert.ts b/test/src/helpers/fileAssert.ts
index e88ec68c352..71628624e3e 100644
--- a/test/src/helpers/fileAssert.ts
+++ b/test/src/helpers/fileAssert.ts
@@ -5,9 +5,6 @@ import { diffJson } from "diff"
 import { AssertionError } from "assert"
 import * as path from "path"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 // http://joel-costigliola.github.io/assertj/
 export function assertThat(actual: any): Assertions {
   return new Assertions(actual)
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
index d27e55de3a0..00ca682b6b8 100755
--- a/test/src/helpers/packTester.ts
+++ b/test/src/helpers/packTester.ts
@@ -9,8 +9,8 @@ import { exec } from "out/util/util"
 import { log, warn } from "out/util/log"
 import { createTargets } from "out"
 import { getArchSuffix, Target } from "out/platformPackager"
-import pathSorter = require("path-sort")
-import DecompressZip = require("decompress-zip")
+import pathSorter from "path-sort"
+import DecompressZip from "decompress-zip"
 import { convertVersion } from "out/targets/squirrelPack"
 import { spawnNpmProduction } from "out/util/util"
 import { TEST_DIR } from "./config"
@@ -18,9 +18,6 @@ import { deepAssign } from "out/util/deepAssign"
 import { AssertContext } from "ava-tf"
 import { SquirrelWindowsOptions } from "out/options/winOptions"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 if (process.env.TRAVIS !== "true") {
   // we don't use CircleCI, so, we can safely set this env
   process.env.CIRCLE_BUILD_NUM = 42
diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
index 918a9809c2e..2cbf7559822 100755
--- a/test/src/helpers/runTests.ts
+++ b/test/src/helpers/runTests.ts
@@ -1,15 +1,12 @@
 import { spawn } from "child_process"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { copy, emptyDir, outputFile, readdir, readFileSync, readJson, unlink, removeSync } from "fs-extra-p"
 import { Platform } from "out/metadata"
 import { cpus, homedir, tmpdir } from "os"
 import { TEST_DIR, ELECTRON_VERSION } from "./config"
 
 // we set NODE_PATH in this file, so, we cannot use 'out/awaiter' path here
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("../../../out/util/awaiter")
-
 const util = require("../../../out/util/util")
 const utilSpawn = util.spawn
 const isEmptyOrSpaces = util.isEmptyOrSpaces
@@ -140,6 +137,10 @@ function runTests(): BluebirdPromise<any> {
 
   args.push(`--concurrency=${cpus().length}`)
 
+  if (process.env.FAIL_FAST === "true") {
+    args.push("--fail-fast")
+  }
+
   const baseDir = path.join("test", "out")
   const baseForLinuxTests = [path.join(baseDir, "ArtifactPublisherTest.js"), path.join(baseDir, "httpRequestTest.js"), path.join(baseDir, "RepoSlugTest.js")]
   let skipWin = false
@@ -149,8 +150,6 @@ function runTests(): BluebirdPromise<any> {
       // test it only on Linux in any case
       args.push(...baseForLinuxTests)
     }
-
-    console.log(`Test files: ${args.join(", ")}`)
   }
   else if (!isEmptyOrSpaces(process.env.CIRCLE_NODE_INDEX)) {
     const circleNodeIndex = parseInt(process.env.CIRCLE_NODE_INDEX, 10)
@@ -171,6 +170,7 @@ function runTests(): BluebirdPromise<any> {
     args.push("test/out/*.js", "!test/out/httpRequestTest.js")
   }
 
+  console.log(args)
   return utilSpawn(path.join(rootDir, "node_modules", ".bin", "ava"), args, {
     cwd: rootDir,
     env: Object.assign({}, process.env, {
diff --git a/test/src/helpers/wine.ts b/test/src/helpers/wine.ts
index de2dc99e715..6dab4f23fc6 100644
--- a/test/src/helpers/wine.ts
+++ b/test/src/helpers/wine.ts
@@ -2,13 +2,10 @@ import { exec } from "out/util/util"
 import { homedir } from "os"
 import { emptyDir, readFile, writeFile, ensureDir } from "fs-extra-p"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
-import pathSorter = require("path-sort")
+import BluebirdPromise from "bluebird"
+import pathSorter from "path-sort"
 import { unlinkIfExists } from "out/util/util"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 export class WineManager {
   wineDir: string
   private winePreparePromise: Promise<any> | null
diff --git a/test/src/httpRequestTest.ts b/test/src/httpRequestTest.ts
index 28fd2337ea4..ae63a06339b 100644
--- a/test/src/httpRequestTest.ts
+++ b/test/src/httpRequestTest.ts
@@ -5,9 +5,6 @@ import { randomBytes } from "crypto"
 import { assertThat } from "./helpers/fileAssert"
 import * as path from "path"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test("download to nonexistent dir", () => {
   const tempFile = path.join(tmpdir(), `${process.pid}-${randomBytes(8).toString("hex")}`, Date.now().toString(), "foo.txt")
   return download("https://drive.google.com/uc?export=download&id=0Bz3JwZ-jqfRONTkzTGlsMkM2TlE", tempFile)
diff --git a/test/src/linuxPackagerTest.ts b/test/src/linuxPackagerTest.ts
index 6895883111a..990079ffa36 100755
--- a/test/src/linuxPackagerTest.ts
+++ b/test/src/linuxPackagerTest.ts
@@ -5,9 +5,6 @@ import * as path from "path"
 import { Platform } from "out"
 import { Arch } from "out/metadata"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test.ifNotWindows("deb", app({targets: Platform.LINUX.createTarget("deb")}))
 
 test.ifNotWindows("arm deb", app({targets: Platform.LINUX.createTarget("deb", Arch.armv7l)}))
diff --git a/test/src/macPackagerTest.ts b/test/src/macPackagerTest.ts
index 3c730aec86c..ff87d3a225f 100644
--- a/test/src/macPackagerTest.ts
+++ b/test/src/macPackagerTest.ts
@@ -4,7 +4,7 @@ import OsXPackager from "out/macPackager"
 import { writeFile, remove, copy, mkdir } from "fs-extra-p"
 import * as path from "path"
 import { BuildInfo } from "out/platformPackager"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { assertThat } from "./helpers/fileAssert"
 import { Platform, MacOptions, createTargets } from "out"
 import { SignOptions, FlatOptions } from "electron-osx-sign-tf"
@@ -16,9 +16,6 @@ import { attachAndExecute } from "out/targets/dmg"
 import { getTempName } from "out/util/util"
 import { exec } from "out/util/util"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test.ifOsx("two-package", () => assertPack("test-app", {targets: createTargets([Platform.MAC], null, "all")}, {signed: true, useTempDir: true}))
 
 test.ifOsx("one-package", app(platform(Platform.MAC), {signed: true}))
@@ -292,7 +289,8 @@ class CheckingMacPackager extends OsXPackager {
         break
       }
     }
-    return await super.pack(outDir, arch, targets, postAsyncTasks)
+    // http://madole.xyz/babel-plugin-transform-async-to-module-method-gotcha/
+    return await OsXPackager.prototype.pack.call(this, outDir, arch, targets, postAsyncTasks)
   }
 
   async doPack(outDir: string, appOutDir: string, platformName: string, arch: Arch, customBuildOptions: MacOptions, postAsyncTasks: Array<Promise<any>> = null) {
diff --git a/test/src/nsisTest.ts b/test/src/nsisTest.ts
index 0a6887a5358..edae610e2c0 100644
--- a/test/src/nsisTest.ts
+++ b/test/src/nsisTest.ts
@@ -3,16 +3,13 @@ import test from "./helpers/avaEx"
 import { assertPack, getTestAsset, app } from "./helpers/packTester"
 import { copy, outputFile, readJson } from "fs-extra-p"
 import * as path from "path"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { assertThat } from "./helpers/fileAssert"
 import { extractFile } from "asar-electron-builder"
 import { walk } from "out/asarUtil"
 import { nsisPerMachineInstall } from "./helpers/expectedContents"
 import { WineManager, diff } from "./helpers/wine"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 const nsisTarget = Platform.WINDOWS.createTarget(["nsis"])
 
 test("one-click", app({
diff --git a/test/src/nsisUpdaterTest.ts b/test/src/nsisUpdaterTest.ts
index 3c7cd0f0e48..1b7a41d005d 100644
--- a/test/src/nsisUpdaterTest.ts
+++ b/test/src/nsisUpdaterTest.ts
@@ -5,8 +5,7 @@ import * as path from "path"
 import { TmpDir } from "out/util/tmp"
 import { outputJson } from "fs-extra-p"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
+const NsisUpdaterClass = require("../../nsis-auto-updater/out/nsis-auto-updater/src/NsisUpdater").NsisUpdater
 
 const g = (<any>global)
 g.__test_app = {
@@ -15,8 +14,6 @@ g.__test_app = {
   }
 }
 
-const NsisUpdaterClass = require("../../nsis-auto-updater/out/nsis-auto-updater/src/NsisUpdater").NsisUpdater
-
 test("check updates - no versions at all", async (t) => {
   const updater: NsisUpdater = new NsisUpdaterClass({
       provider: "bintray",
diff --git a/test/src/winPackagerTest.ts b/test/src/winPackagerTest.ts
index 58ea8ed4ea4..e094b6c46e9 100755
--- a/test/src/winPackagerTest.ts
+++ b/test/src/winPackagerTest.ts
@@ -4,15 +4,12 @@ import { assertPack, platform, modifyPackageJson, getTestAsset, app } from "./he
 import { outputFile, rename, copy } from "fs-extra-p"
 import * as path from "path"
 import { WinPackager } from "out/winPackager"
-import { Promise as BluebirdPromise } from "bluebird"
+import BluebirdPromise from "bluebird"
 import { assertThat } from "./helpers/fileAssert"
 import { SignOptions } from "out/windowsCodeSign"
 import SquirrelWindowsTarget from "out/targets/squirrelWindows"
 import { Target } from "out/platformPackager"
 
-//noinspection JSUnusedLocalSymbols
-const __awaiter = require("out/util/awaiter")
-
 test.ifNotCiOsx("win", app({targets: Platform.WINDOWS.createTarget(["default", "zip"])}, {signed: true}))
 
 // very slow
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 135b13e5428..24839fa638d 100755
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,12 +1,11 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
+    "module": "es2015",
+    "target": "es2017",
     "noImplicitAny": true,
     "removeComments": true,
     "outDir": "out",
     "newLine": "LF",
-    "noResolve": true,
     "noEmitOnError": true,
     "inlineSources": true,
     "sourceMap": true,
@@ -15,17 +14,20 @@
     "noFallthroughCasesInSwitch": true,
     "skipLibCheck": true
   },
+  "rootDirs": [
+    "src",
+    "../src"
+  ],
   "include": [
     "../typings/**/*.d.ts",
     "typings/**/*.d.ts",
     "src/**/*.ts",
     "../node_modules/ava-tf/types/generated.d.ts",
     "../node_modules/fs-extra-p/index.d.ts",
-    "../node_modules/fs-extra-p/bluebird.d.ts",
     "../node_modules/electron-osx-sign-tf/index.d.ts",
-    "../node_modules/@types/**/*.d.ts"
+    "../node_modules/@types/**/*.d.ts",
+    "../node_modules/@develar/types/*.d.ts"
   ],
   "exclude": [
-    "../node_modules/@types/node/node-*.d.ts"
   ]
 }
diff --git a/test/typings/decompress-zip.d.ts b/test/typings/decompress-zip.d.ts
index 8f14bb5ad3a..dcede601280 100644
--- a/test/typings/decompress-zip.d.ts
+++ b/test/typings/decompress-zip.d.ts
@@ -5,7 +5,7 @@ declare module "decompress-zip" {
     path: string
   }
 
-  export = class DecompressZip extends EventEmitter {
+  export default class DecompressZip extends EventEmitter {
     constructor(filename: string)
 
     list(): void
diff --git a/tsconfig.json b/tsconfig.json
index 22f59bfe1c7..64b3850c637 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,34 +1,35 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
+    "module": "es2015",
+    "target": "es2017",
     "noImplicitAny": true,
     "outDir": "out",
     "newLine": "LF",
-    "noResolve": true,
     "noEmitOnError": true,
     "inlineSources": true,
     "sourceMap": true,
     "noImplicitReturns": true,
     "strictNullChecks": true,
     "noEmitHelpers": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true
+    "noFallthroughCasesInSwitch": true
+//    "skipLibCheck": true
   },
   "declaration": {
     "electron-builder": "out/electron-builder.d.ts",
     "": "test/typings/electron-builder.d.ts"
   },
   "docs": "docs/Options.md",
+  "files": [
+    "node_modules/fs-extra-p/index.d.ts",
+    "node_modules/7zip-bin/index.d.ts",
+    "node_modules/electron-osx-sign-tf/index.d.ts"
+  ],
   "include": [
     "src/**/*.ts",
     "typings/**/*.d.ts",
-    "node_modules/fs-extra-p/index.d.ts",
-    "node_modules/7zip-bin/index.d.ts",
-    "node_modules/fs-extra-p/bluebird.d.ts",
-    "node_modules/electron-osx-sign-tf/index.d.ts",
-    "node_modules/@types/**/*.d.ts"
+    "node_modules/@types/**/*.d.ts",
+    "node_modules/@develar/types/*.d.ts"
   ],
   "exclude": [
   ]
-}
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index 269c67f2408..1ea19379d63 100644
--- a/tslint.json
+++ b/tslint.json
@@ -6,10 +6,7 @@
       "variables-before-functions"
     ],
     "no-unused-variable": [
-      true,
-      {
-        "ignore-pattern": "^_+awaiter$"
-      }
+      true
     ],
     "one-line": [
       true,
diff --git a/typings/chalk.d.ts b/typings/chalk.d.ts
index e2555dabea0..b87ba79cfe3 100644
--- a/typings/chalk.d.ts
+++ b/typings/chalk.d.ts
@@ -1,123 +1,114 @@
-// Type definitions for chalk v0.4.0
-// Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Chalk {
-
-    export var enabled: boolean;
-    export var supportsColor: boolean;
-    export var styles: ChalkStyleMap;
-
-    export function stripColor(value: string): any;
-    export function hasColor(str: string): boolean;
-
-    export interface ChalkChain extends ChalkStyle {
-        (...text: string[]): string;
-    }
-
-    export interface ChalkStyleElement {
-        open: string;
-        close: string;
-    }
-
+declare module "chalk" {
+  let enabled: boolean;
+  let supportsColor: boolean;
+  let styles: ChalkStyleMap;
+
+  export function stripColor(value: string): any;
+
+  export function hasColor(str: string): boolean;
+
+  export interface ChalkChain extends ChalkStyle {
+    (...text: string[]): string;
+  }
+
+  export interface ChalkStyleElement {
+    open: string;
+    close: string;
+  }
+
+  // General
+  let reset: ChalkChain;
+  let bold: ChalkChain;
+  let italic: ChalkChain;
+  let underline: ChalkChain;
+  let inverse: ChalkChain;
+  let strikethrough: ChalkChain;
+  let dim: ChalkChain;
+
+  // Text colors
+  let black: ChalkChain;
+  let red: ChalkChain;
+  let green: ChalkChain;
+  let yellow: ChalkChain;
+  let blue: ChalkChain;
+  let magenta: ChalkChain;
+  let cyan: ChalkChain;
+  let white: ChalkChain;
+  let gray: ChalkChain;
+  let grey: ChalkChain;
+
+  // Background colors
+  let bgBlack: ChalkChain;
+  let bgRed: ChalkChain;
+  let bgGreen: ChalkChain;
+  let bgYellow: ChalkChain;
+  let bgBlue: ChalkChain;
+  let bgMagenta: ChalkChain;
+  let bgCyan: ChalkChain;
+  let bgWhite: ChalkChain;
+
+
+  export interface ChalkStyle {
     // General
-    export var reset: ChalkChain;
-    export var bold: ChalkChain;
-    export var italic: ChalkChain;
-    export var underline: ChalkChain;
-    export var inverse: ChalkChain;
-    export var strikethrough: ChalkChain;
-    export var dim: ChalkChain;
+    reset: ChalkChain;
+    bold: ChalkChain;
+    italic: ChalkChain;
+    underline: ChalkChain;
+    inverse: ChalkChain;
+    strikethrough: ChalkChain;
 
     // Text colors
-    export var black: ChalkChain;
-    export var red: ChalkChain;
-    export var green: ChalkChain;
-    export var yellow: ChalkChain;
-    export var blue: ChalkChain;
-    export var magenta: ChalkChain;
-    export var cyan: ChalkChain;
-    export var white: ChalkChain;
-    export var gray: ChalkChain;
-    export var grey: ChalkChain;
+    black: ChalkChain;
+    red: ChalkChain;
+    green: ChalkChain;
+    yellow: ChalkChain;
+    blue: ChalkChain;
+    magenta: ChalkChain;
+    cyan: ChalkChain;
+    white: ChalkChain;
+    gray: ChalkChain;
+    grey: ChalkChain;
 
     // Background colors
-    export var bgBlack: ChalkChain;
-    export var bgRed: ChalkChain;
-    export var bgGreen: ChalkChain;
-    export var bgYellow: ChalkChain;
-    export var bgBlue: ChalkChain;
-    export var bgMagenta: ChalkChain;
-    export var bgCyan: ChalkChain;
-    export var bgWhite: ChalkChain;
-
-
-    export interface ChalkStyle {
-        // General
-        reset: ChalkChain;
-        bold: ChalkChain;
-        italic: ChalkChain;
-        underline: ChalkChain;
-        inverse: ChalkChain;
-        strikethrough: ChalkChain;
-
-        // Text colors
-        black: ChalkChain;
-        red: ChalkChain;
-        green: ChalkChain;
-        yellow: ChalkChain;
-        blue: ChalkChain;
-        magenta: ChalkChain;
-        cyan: ChalkChain;
-        white: ChalkChain;
-        gray: ChalkChain;
-        grey: ChalkChain;
-
-        // Background colors
-        bgBlack: ChalkChain;
-        bgRed: ChalkChain;
-        bgGreen: ChalkChain;
-        bgYellow: ChalkChain;
-        bgBlue: ChalkChain;
-        bgMagenta: ChalkChain;
-        bgCyan: ChalkChain;
-        bgWhite: ChalkChain;
-    }
-
-    export interface ChalkStyleMap {
-        // General
-        reset: ChalkStyleElement;
-        bold: ChalkStyleElement;
-        italic: ChalkStyleElement;
-        underline: ChalkStyleElement;
-        inverse: ChalkStyleElement;
-        strikethrough: ChalkStyleElement;
-
-        // Text colors
-        black: ChalkStyleElement;
-        red: ChalkStyleElement;
-        green: ChalkStyleElement;
-        yellow: ChalkStyleElement;
-        blue: ChalkStyleElement;
-        magenta: ChalkStyleElement;
-        cyan: ChalkStyleElement;
-        white: ChalkStyleElement;
-        gray: ChalkStyleElement;
+    bgBlack: ChalkChain;
+    bgRed: ChalkChain;
+    bgGreen: ChalkChain;
+    bgYellow: ChalkChain;
+    bgBlue: ChalkChain;
+    bgMagenta: ChalkChain;
+    bgCyan: ChalkChain;
+    bgWhite: ChalkChain;
+  }
+
+  export interface ChalkStyleMap {
+    // General
+    reset: ChalkStyleElement;
+    bold: ChalkStyleElement;
+    italic: ChalkStyleElement;
+    underline: ChalkStyleElement;
+    inverse: ChalkStyleElement;
+    strikethrough: ChalkStyleElement;
 
-        // Background colors
-        bgBlack: ChalkStyleElement;
-        bgRed: ChalkStyleElement;
-        bgGreen: ChalkStyleElement;
-        bgYellow: ChalkStyleElement;
-        bgBlue: ChalkStyleElement;
-        bgMagenta: ChalkStyleElement;
-        bgCyan: ChalkStyleElement;
-        bgWhite: ChalkStyleElement;
-    }
-}
+    // Text colors
+    black: ChalkStyleElement;
+    red: ChalkStyleElement;
+    green: ChalkStyleElement;
+    yellow: ChalkStyleElement;
+    blue: ChalkStyleElement;
+    magenta: ChalkStyleElement;
+    cyan: ChalkStyleElement;
+    white: ChalkStyleElement;
+    gray: ChalkStyleElement;
 
-declare module "chalk" {
-    export = Chalk;
+    // Background colors
+    bgBlack: ChalkStyleElement;
+    bgRed: ChalkStyleElement;
+    bgGreen: ChalkStyleElement;
+    bgYellow: ChalkStyleElement;
+    bgBlue: ChalkStyleElement;
+    bgMagenta: ChalkStyleElement;
+    bgCyan: ChalkStyleElement;
+    bgWhite: ChalkStyleElement;
+  }
 }
 
diff --git a/typings/debug.d.ts b/typings/debug.d.ts
new file mode 100644
index 00000000000..0ad1e465305
--- /dev/null
+++ b/typings/debug.d.ts
@@ -0,0 +1,13 @@
+declare module "debug" {
+  export default function debug(namespace: string): debug.Debugger
+}
+
+declare namespace debug {
+  export interface Debugger {
+    (formatter: any, ...args: any[]): void
+
+    enabled: boolean;
+    log: Function;
+    namespace: string;
+  }
+}
\ No newline at end of file
diff --git a/typings/lib.es2016.array.include.d.ts b/typings/lib.es2016.array.include.d.ts
index cc957a64c42..c89e96c2b9f 100644
--- a/typings/lib.es2016.array.include.d.ts
+++ b/typings/lib.es2016.array.include.d.ts
@@ -1,107 +1,2 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
 // TS is ugly outdated monstrous language (dream about Kotlin)
-type n = null | undefined
-
-interface Array<T> {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: T, fromIndex?: number): boolean;
-}
-
-interface Int8Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Uint8Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Uint8ClampedArray {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Int16Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Uint16Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Int32Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Uint32Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Float32Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
-
-interface Float64Array {
-    /**
-      * Determines whether an array includes a certain element, returning true or false as appropriate.
-      * @param searchElement The element to search for.
-      * @param fromIndex The position in this array at which to begin searching for searchElement.
-      */
-    includes(searchElement: number, fromIndex?: number): boolean;
-}
\ No newline at end of file
+type n = null | undefined
\ No newline at end of file
diff --git a/typings/mime.d.ts b/typings/mime.d.ts
new file mode 100644
index 00000000000..863d06ac5fd
--- /dev/null
+++ b/typings/mime.d.ts
@@ -0,0 +1,21 @@
+declare module "mime" {
+  class Mime {
+    charsets: Charsets;
+    default_type: string;
+
+    lookup(path: string): string;
+
+    extension(mime: string): string;
+
+    load(filepath: string): void;
+
+    define(mimes: Object): void;
+  }
+
+  interface Charsets {
+    lookup(mime: string): string;
+  }
+
+  const mime: Mime
+  export default mime
+}
\ No newline at end of file
diff --git a/typings/path-sort.d.ts b/typings/path-sort.d.ts
index a091e4f5d24..e7aacb11953 100644
--- a/typings/path-sort.d.ts
+++ b/typings/path-sort.d.ts
@@ -1,5 +1,5 @@
 declare module "path-sort" {
   function sort(files: Array<string>): Array<string>
 
-  export = sort
+  export default sort
 }
\ No newline at end of file
diff --git a/typings/pretty-ms.d.ts b/typings/pretty-ms.d.ts
index 17e1a9f50ad..c72b5934e94 100644
--- a/typings/pretty-ms.d.ts
+++ b/typings/pretty-ms.d.ts
@@ -2,5 +2,5 @@
 declare module "pretty-ms" {
   function prettyMs(ms: number): string
 
-  export= prettyMs
+  export default prettyMs
 }
\ No newline at end of file
diff --git a/typings/progress-stream.d.ts b/typings/progress-stream.d.ts
index e2063c76564..fe775220b42 100644
--- a/typings/progress-stream.d.ts
+++ b/typings/progress-stream.d.ts
@@ -12,5 +12,5 @@ declare module "progress-stream" {
 
   function progress(options: Options, onProgress?: (progress: Progress) => void): ReadWriteStream
 
-  export = progress
+  export default progress
 }
\ No newline at end of file
diff --git a/typings/progress.d.ts b/typings/progress.d.ts
new file mode 100644
index 00000000000..5a7ec4207d2
--- /dev/null
+++ b/typings/progress.d.ts
@@ -0,0 +1,115 @@
+declare module "progress" {
+  /**
+   * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
+   */
+  interface ProgressBarOptions {
+    /**
+     * Total number of ticks to complete.
+     */
+    total: number;
+
+    /**
+     * The displayed width of the progress bar defaulting to total.
+     */
+    width?: number;
+
+    /**
+     * The output stream defaulting to stderr.
+     */
+    stream?: NodeJS.WritableStream;
+
+    /**
+     * Completion character defaulting to "=".
+     */
+    complete?: string;
+
+    /**
+     * Incomplete character defaulting to "-".
+     */
+    incomplete?: string;
+
+    /**
+     * Option to clear the bar on completion defaulting to false.
+     */
+    clear?: boolean;
+
+    /**
+     * Optional function to call when the progress bar completes.
+     */
+    callback?: Function;
+  }
+
+
+  /**
+   * Flexible ascii progress bar.
+   */
+  class ProgressBar {
+    /**
+     * Initialize a `ProgressBar` with the given `fmt` string and `options` or
+     * `total`.
+     *
+     * Options:
+     *   - `total` total number of ticks to complete
+     *   - `width` the displayed width of the progress bar defaulting to total
+     *   - `stream` the output stream defaulting to stderr
+     *   - `complete` completion character defaulting to "="
+     *   - `incomplete` incomplete character defaulting to "-"
+     *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
+     *   - `callback` optional function to call when the progress bar completes
+     *   - `clear` will clear the progress bar upon termination
+     *
+     * Tokens:
+     *   - `:bar` the progress bar itself
+     *   - `:current` current tick number
+     *   - `:total` total ticks
+     *   - `:elapsed` time elapsed in seconds
+     *   - `:percent` completion percentage
+     *   - `:eta` eta in seconds
+     */
+    constructor(format: string, total: number);
+    constructor(format: string, options: ProgressBarOptions);
+
+
+    /**
+     * "tick" the progress bar with optional `len` and optional `tokens`.
+     */
+    tick(tokens?: any): void;
+    tick(count?: number, tokens?: any): void;
+
+
+    /**
+     * Method to render the progress bar with optional `tokens` to place in the
+     * progress bar's `fmt` field.
+     */
+    render(tokens?: any): void;
+
+
+    /**
+     * "update" the progress bar to represent an exact percentage.
+     * The ratio (between 0 and 1) specified will be multiplied by `total` and
+     * floored, representing the closest available "tick." For example, if a
+     * progress bar has a length of 3 and `update(0.5)` is called, the progress
+     * will be set to 1.
+     *
+     * A ratio of 0.5 will attempt to set the progress to halfway.
+     *
+     * @param ratio The ratio (between 0 and 1 inclusive) to set the
+     *   overall completion to.
+     */
+    update(ratio: number, tokens?: any): void;
+
+
+    /**
+     * Terminates a progress bar.
+     */
+    terminate(): void;
+
+
+    /**
+     * Completed status of progress (Boolean)
+     */
+    complete: boolean;
+  }
+
+  export default ProgressBar;
+}
\ No newline at end of file
diff --git a/typings/sanitize-filename.d.ts b/typings/sanitize-filename.d.ts
index 001e5d84b47..51ca2eb05b2 100644
--- a/typings/sanitize-filename.d.ts
+++ b/typings/sanitize-filename.d.ts
@@ -1,5 +1,5 @@
 declare module "sanitize-filename" {
   function sanitize(name: string): string
 
-  export = sanitize
+  export default sanitize
 }
\ No newline at end of file
diff --git a/typings/semver.d.ts b/typings/semver.d.ts
new file mode 100644
index 00000000000..945584114fd
--- /dev/null
+++ b/typings/semver.d.ts
@@ -0,0 +1,175 @@
+declare module "semver" {
+  /**
+   * Return the parsed version, or null if it's not valid.
+   */
+  function valid(v: string, loose?: boolean): string;
+
+  /**
+   * Returns cleaned (removed leading/trailing whitespace, remove '=v' prefix) and parsed version, or null if version is invalid.
+   */
+  function clean(version: string, loose?: boolean): string;
+
+  /**
+   * Return the version incremented by the release type (major, minor, patch, or prerelease), or null if it's not valid.
+   */
+  function inc(v: string, release: string, loose?: boolean): string;
+
+  /**
+   * Return the major version number.
+   */
+  function major(v: string, loose?: boolean): number;
+
+  /**
+   * Return the minor version number.
+   */
+  function minor(v: string, loose?: boolean): number;
+
+  /**
+   * Return the patch version number.
+   */
+  function patch(v: string, loose?: boolean): number;
+
+  /**
+   * Returns an array of prerelease components, or null if none exist.
+   */
+  function prerelease(v: string, loose?: boolean): string[];
+
+  // Comparison
+  /**
+   * v1 > v2
+   */
+  function gt(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * v1 >= v2
+   */
+  function gte(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * v1 < v2
+   */
+  function lt(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * v1 <= v2
+   */
+  function lte(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings.
+   */
+  function eq(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * v1 != v2 The opposite of eq.
+   */
+  function neq(v1: string, v2: string, loose?: boolean): boolean;
+
+  /**
+   * Pass in a comparison string, and it'll call the corresponding semver comparison function. "===" and "!==" do simple string comparison, but are included for completeness. Throws if an invalid comparison string is provided.
+   */
+  function cmp(v1: string, comparator: any, v2: string, loose?: boolean): boolean;
+
+  /**
+   * Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if v2 is greater. Sorts in ascending order if passed to Array.sort().
+   */
+  function compare(v1: string, v2: string, loose?: boolean): number;
+
+  /**
+   * The reverse of compare. Sorts an array of versions in descending order when passed to Array.sort().
+   */
+  function rcompare(v1: string, v2: string, loose?: boolean): number;
+
+  /**
+   * Returns difference between two versions by the release type (major, premajor, minor, preminor, patch, prepatch, or prerelease), or null if the versions are the same.
+   */
+  function diff(v1: string, v2: string, loose?: boolean): string;
+
+  // Ranges
+  /**
+   * Return the valid range or null if it's not valid
+   */
+  function validRange(range: string, loose?: boolean): string;
+
+  /**
+   * Return true if the version satisfies the range.
+   */
+  function satisfies(version: string, range: string, loose?: boolean): boolean;
+
+  /**
+   * Return the highest version in the list that satisfies the range, or null if none of them do.
+   */
+  function maxSatisfying(versions: string[], range: string, loose?: boolean): string;
+
+  /**
+   * Return the lowest version in the list that satisfies the range, or null if none of them do.
+   */
+  function minSatisfying(versions: string[], range: string, loose?: boolean): string;
+
+  /**
+   * Return true if version is greater than all the versions possible in the range.
+   */
+  function gtr(version: string, range: string, loose?: boolean): boolean;
+
+  /**
+   * Return true if version is less than all the versions possible in the range.
+   */
+  function ltr(version: string, range: string, loose?: boolean): boolean;
+
+  /**
+   * Return true if the version is outside the bounds of the range in either the high or low direction. The hilo argument must be either the string '>' or '<'. (This is the function called by gtr and ltr.)
+   */
+  function outside(version: string, range: string, hilo: string, loose?: boolean): boolean;
+
+  class SemVerBase {
+    raw: string;
+    loose: boolean;
+
+    format(): string;
+
+    inspect(): string;
+
+    toString(): string;
+  }
+
+  class SemVer extends SemVerBase {
+    constructor(version: string, loose?: boolean);
+
+    major: number;
+    minor: number;
+    patch: number;
+    version: string;
+    build: string[];
+    prerelease: string[];
+
+    compare(other: SemVer): number;
+
+    compareMain(other: SemVer): number;
+
+    comparePre(other: SemVer): number;
+
+    inc(release: string): SemVer;
+  }
+
+  class Comparator extends SemVerBase {
+    constructor(comp: string, loose?: boolean);
+
+    semver: SemVer;
+    operator: string;
+    value: boolean;
+
+    parse(comp: string): void;
+
+    test(version: SemVer): boolean;
+  }
+
+  class Range extends SemVerBase {
+    constructor(range: string, loose?: boolean);
+
+    set: Comparator[][];
+
+    parseRange(range: string): Comparator[];
+
+    test(version: SemVer): boolean;
+  }
+}
diff --git a/typings/updateNotifier.d.ts b/typings/updateNotifier.d.ts
index 17b6508ff6b..9e21bf92b25 100644
--- a/typings/updateNotifier.d.ts
+++ b/typings/updateNotifier.d.ts
@@ -16,5 +16,5 @@ declare module "update-notifier" {
 
   function updateNotifier(options: NotifyOptions): Notifier
 
-  export = updateNotifier
+  export default updateNotifier
 }
\ No newline at end of file
diff --git a/typings/yargs.d.ts b/typings/yargs.d.ts
index 9f13b80edcf..b3331d4b293 100644
--- a/typings/yargs.d.ts
+++ b/typings/yargs.d.ts
@@ -96,5 +96,5 @@ declare module 'yargs' {
   type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
 
   const yargs: Yargs;
-  export = yargs;
+  export default yargs;
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index c17ca8e7219..b140778af39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,5 +1,12 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+"@develar/babel-plugin-transform-inline-imports-commonjs@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@develar/babel-plugin-transform-inline-imports-commonjs/-/babel-plugin-transform-inline-imports-commonjs-1.1.1.tgz#8bd16f069a02d973677183abed8faf6b4af759e2"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.8.0"
+    builtin-modules "^1.1.1"
+
 "@develar/semantic-release@^6.3.6":
   version "6.3.6"
   resolved "https://registry.yarnpkg.com/@develar/semantic-release/-/semantic-release-6.3.6.tgz#0f29ca204f16e8032810892be07bb0a35e2564e5"
@@ -23,6 +30,10 @@
     run-series "^1.1.4"
     semver "^5.3.0"
 
+"@develar/types@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@develar/types/-/types-1.0.1.tgz#c6f8cb644e460938931dcccfe37b32d42710e7a5"
+
 "@semantic-release/commit-analyzer@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@semantic-release/commit-analyzer/-/commit-analyzer-2.0.0.tgz#924d1e2c30167c6a472bed9f66ee8f8e077489b2"
@@ -56,28 +67,10 @@
     conventional-changelog "0.0.17"
     github-url-from-git "^1.4.0"
 
-"@types/debug@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.29.tgz#a1e514adfbd92f03a224ba54d693111dbf1f3754"
-
-"@types/mime@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
-
 "@types/node@*":
   version "6.0.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.45.tgz#c4842a9d653d767831e4ff495b6008cc0d579966"
 
-"@types/progress@^1.1.28":
-  version "1.1.28"
-  resolved "https://registry.yarnpkg.com/@types/progress/-/progress-1.1.28.tgz#b9c9bd9f985c14a147ace99a017fd8f208e11882"
-  dependencies:
-    "@types/node" "*"
-
-"@types/semver@^5.3.30":
-  version "5.3.30"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.3.30.tgz#b55a3bd07b6b8b35f9d4472e1fc3318b68a493b2"
-
 "@types/source-map-support@^0.2.28":
   version "0.2.28"
   resolved "https://registry.yarnpkg.com/@types/source-map-support/-/source-map-support-0.2.28.tgz#ce6497dfa9c9fbd21a753955b4a51d8993d759dd"
@@ -96,9 +89,9 @@
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.0.2.tgz#4c36399413922f111b8e80df3065a4069cfc0a64"
 
-"7zip-bin@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.0.3.tgz#3b21c60b88c29d6e7e5ef1da76f072194efd12db"
+"7zip-bin@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.0.4.tgz#0cd28ac3301b1302fbd99922bacb8bad98103e12"
   optionalDependencies:
     "7zip-bin-linux" "^1.0.3"
     "7zip-bin-mac" "^1.0.1"
@@ -303,9 +296,9 @@ ava-init@^0.1.6:
     the-argv "^1.0.0"
     write-pkg "^1.0.0"
 
-ava-tf@^0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/ava-tf/-/ava-tf-0.16.2.tgz#86107c0f0d09b5b719aae70b4477f39ecd1f1598"
+ava-tf@^0.16.4:
+  version "0.16.4"
+  resolved "https://registry.yarnpkg.com/ava-tf/-/ava-tf-0.16.4.tgz#5bb9d054bb17ca588dd8ffa5df4b15e3df55fa18"
   dependencies:
     arr-flatten "^1.0.1"
     array-union "^1.0.2"
@@ -638,6 +631,15 @@ babel-plugin-transform-async-to-generator@^6.16.0:
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.0.0"
 
+babel-plugin-transform-async-to-module-method@^6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-module-method/-/babel-plugin-transform-async-to-module-method-6.16.0.tgz#3c88b4f0c5bf65e7b5960a48731f21ad0fb5a55f"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.16.0"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.0.0"
+    babel-types "^6.16.0"
+
 babel-plugin-transform-class-properties@^6.16.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
@@ -1071,7 +1073,7 @@ buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1490,9 +1492,9 @@ electron-download@2.1.2:
     path-exists "^1.0.0"
     rc "^1.1.2"
 
-electron-osx-sign-tf@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign-tf/-/electron-osx-sign-tf-1.0.0.tgz#bee60d13495fd85bfb8c2b63ef582a880aae6c6b"
+electron-osx-sign-tf@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/electron-osx-sign-tf/-/electron-osx-sign-tf-1.0.1.tgz#28b23ad68c99a549d244e35554af68f41527522d"
   dependencies:
     bluebird "^3.4.6"
     compare-version "^0.1.2"
@@ -1694,9 +1696,9 @@ from@~0:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc"
 
-fs-extra-p@^1.1.10, fs-extra-p@^1.1.8:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-1.1.10.tgz#10ff1f1091454b99d9cd6c6eaad84ca8ae85d977"
+fs-extra-p@^1.1.8, fs-extra-p@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-1.2.0.tgz#16abed58ec63219cf9244a5a54ba200d4864b347"
   dependencies:
     bluebird "^3.4.6"
     fs-extra-tf "^0.30.3"
@@ -2643,6 +2645,10 @@ node-uuid@~1.4.7:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"
 
+nodent-runtime@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.0.1.tgz#b0d76930c8e6de07cd8df193a82e8c949c9f6dc5"
+
 nopt@^3.0.1, nopt@^3.0.6, nopt@~3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -3230,8 +3236,8 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.0.1.tgz#c3ee5ec585bce29f88bf41629a3944c71ed53e25"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.1.0.tgz#997c08256e0c7999837b90e944db39d8a790276b"
   dependencies:
     rc "^1.1.6"
 
@@ -3436,7 +3442,7 @@ sort-keys@^1.1.1:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-map-support@^0.4.2, source-map-support@^0.4.3, source-map-support@^0.4.4, source-map-support@^0.4.5:
+source-map-support@^0.4.2, source-map-support@^0.4.4, source-map-support@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.5.tgz#4438df4219e1b3c7feb674614b4c67f9722db1e4"
   dependencies:
@@ -3681,15 +3687,16 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-babel@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-1.0.13.tgz#36d44922536e487e232e578def9df3d94508e06c"
+ts-babel@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-1.1.2.tgz#f7e86fb2a3f7b8ed1e305e8ab89240c13cb7c0f5"
   dependencies:
     babel-core "^6.17.0"
     bluebird "^3.4.6"
+    chalk "^1.1.3"
     fs-extra-p "^1.1.8"
     markdown-it "^8.0.0"
-    source-map-support "^0.4.3"
+    source-map-support "^0.4.5"
 
 tslint@^3.15.1:
   version "3.15.1"
@@ -3719,9 +3726,9 @@ typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.3.tgz#33dec9eae86b8eee327dd419ca050c853cabd514"
+typescript@^2.1.0-dev.20161019:
+  version "2.1.0-dev.20161019"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.0-dev.20161019.tgz#45c6a32b1b4a00dd87c8e1e3ee3e00b80f61b5c0"
 
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"