fix: do not use scoped electron-download

Close #1458
electron-userland · Apr 12, 2017 · 8c79f60 · 8c79f60
1 parent 2ab769d
commit 8c79f60
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -28,16 +28,16 @@
   "///": "all dependencies for all packages (hoisted)",
   "dependencies": {
     "7zip-bin": "^2.0.4",
-    "@electron-builder/electron-download": "4.2.1",
     "ajv": "^5.0.4-beta.2",
     "ajv-keywords": "^2.0.1-beta.2",
     "archiver": "^1.3.0",
-    "aws-sdk": "^2.40.0",
+    "aws-sdk": "^2.41.0",
     "bluebird-lst": "^1.0.2",
     "chalk": "^1.1.3",
     "chromium-pickle-js": "^0.2.0",
     "cuint": "^0.2.2",
     "debug": "^2.6.3",
+    "electron-download-tf": "4.2.1",
     "electron-is-dev": "^0.1.2",
     "electron-osx-sign": "0.4.4",
     "fs-extra-p": "^4.1.0",
@@ -89,8 +89,8 @@
     "path-sort": "^0.1.0",
     "source-map-support": "^0.4.14",
     "ts-babel": "^3.0.0",
-    "tslint": "^5.0.0",
-    "typescript": "^2.2.2",
+    "tslint": "^5.1.0",
+    "typescript": "^2.3.0",
     "whitespace": "^2.1.0",
     "xml2js": "^0.4.17"
   },

diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -54,7 +54,7 @@
     "electron-builder-core": "0.0.0-semantic-release",
     "electron-builder-http": "0.0.0-semantic-release",
     "electron-builder-util": "0.0.0-semantic-release",
-    "@electron-builder/electron-download": "4.2.1",
+    "electron-download-tf": "4.2.1",
     "electron-osx-sign": "0.4.4",
     "electron-publish": "0.0.0-semantic-release",
     "fs-extra-p": "^4.1.0",

diff --git a/packages/electron-builder/src/packager/dirPackager.ts b/packages/electron-builder/src/packager/dirPackager.ts
@@ -7,7 +7,7 @@ import { chmod, emptyDir } from "fs-extra-p"
 import * as path from "path"
 import { PlatformPackager } from "../platformPackager"
 
-const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("@electron-builder/electron-download"))
+const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("electron-download-tf"))
 
 function createDownloadOpts(opts: any, platform: string, arch: string, electronVersion: string) {
   if (opts.download != null) {

diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.1.0",
-    "aws-sdk": "^2.40.0",
+    "aws-sdk": "^2.41.0",
     "mime": "^1.3.4",
     "electron-publish": "~0.0.0-semantic-release",
     "electron-builder-util": "~0.0.0-semantic-release"

diff --git a/packages/electron-updater/src/PrivateGitHubProvider.ts b/packages/electron-updater/src/PrivateGitHubProvider.ts
@@ -117,7 +117,7 @@ export class PrivateGitHubProvider extends BaseGitHubProvider<PrivateGitHubUpdat
     }
     else {
       const name = versionInfo.githubArtifactName || path.posix.basename(versionInfo.path).replace(/ /g, "-")
-      return {
+      return <any>{
         name: name,
         url: versionInfo.assets.find(it => it.name == name)!.url,
         sha2: versionInfo.sha2,

diff --git a/test/out/linux/__snapshots__/snapTest.js.snap b/test/out/linux/__snapshots__/snapTest.js.snap
@@ -4,7 +4,7 @@ exports[`default stagePackages 1`] = `
 Object {
   "apps": Object {
     "sep": Object {
-      "command": "desktop-launch $SNAP/sep",
+      "command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
       "plugs": Array [
         "home",
         "x11",
@@ -56,7 +56,7 @@ exports[`default stagePackages 3`] = `
 Object {
   "apps": Object {
     "sep": Object {
-      "command": "desktop-launch $SNAP/sep",
+      "command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
       "plugs": Array [
         "home",
         "x11",
@@ -110,7 +110,7 @@ exports[`default stagePackages 5`] = `
 Object {
   "apps": Object {
     "sep": Object {
-      "command": "desktop-launch $SNAP/sep",
+      "command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
       "plugs": Array [
         "custom",
         "home",
@@ -164,7 +164,7 @@ exports[`default stagePackages 7`] = `
 Object {
   "apps": Object {
     "sep": Object {
-      "command": "desktop-launch $SNAP/sep",
+      "command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
       "plugs": Array [
         "foo1",
         "home",

diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
@@ -9,7 +9,7 @@ import { ELECTRON_VERSION, TEST_DIR } from "./config"
 const util = require("../../../packages/electron-builder-util/out/util")
 const isEmptyOrSpaces = util.isEmptyOrSpaces
 
-const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("@electron-builder/electron-download"))
+const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("electron-download-tf"))
 
 runTests()
   .catch(error => {

diff --git a/yarn.lock b/yarn.lock
@@ -31,20 +31,6 @@
     typescript "~2.1.5"
     yargs "^7.0.2"
 
-"@electron-builder/[email protected]":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@electron-builder/electron-download/-/electron-download-4.2.1.tgz#b10b7b077523ae2f6c21dc05658df145d716c223"
-  dependencies:
-    debug "^2.6.3"
-    env-paths "^1.0.0"
-    fs-extra "^2.1.2"
-    minimist "^1.2.0"
-    nugget "^2.0.1"
-    path-exists "^3.0.0"
-    rc "^1.2.1"
-    semver "^5.3.0"
-    sumchecker "^2.0.2"
-
 "@types/electron@^1.4.35":
   version "1.4.35"
   resolved "https://registry.yarnpkg.com/@types/electron/-/electron-1.4.35.tgz#48e5e6ef0b49f27b9f78b87d80f796e3f0a4f33c"
@@ -294,9 +280,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-aws-sdk@^2.40.0:
-  version "2.40.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.40.0.tgz#7af7410f0484c9ae0742017e217b39917ebbf8d0"
+aws-sdk@^2.41.0:
+  version "2.41.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.41.0.tgz#930c15ae7ef4532bb8912c4c36a18b0023fd74c2"
   dependencies:
     buffer "4.9.1"
     crypto-browserify "1.0.9"
@@ -1078,6 +1064,20 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
+[email protected]:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.2.1.tgz#d16d2e4c29fc681c10ce42235c629cd812533884"
+  dependencies:
+    debug "^2.6.3"
+    env-paths "^1.0.0"
+    fs-extra "^2.1.2"
+    minimist "^1.2.0"
+    nugget "^2.0.1"
+    path-exists "^3.0.0"
+    rc "^1.2.1"
+    semver "^5.3.0"
+    sumchecker "^2.0.2"
+
 electron-is-dev@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
@@ -3200,9 +3200,9 @@ ts-jsdoc@^1.2.1:
     fs-extra-p "^4.1.0"
     source-map-support "^0.4.14"
 
-tslint@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.0.0.tgz#ad3b7952f8a9b21079248bee01c2eaf92167e185"
+tslint@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.1.0.tgz#51a47baeeb58956fcd617bd2cf00e2ef0eea2ed9"
   dependencies:
     babel-code-frame "^6.22.0"
     colors "^1.1.2"
@@ -3235,8 +3235,8 @@ type-check@~0.3.2:
     prelude-ls "~1.1.2"
 
 typescript@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418"
 
 typescript@~2.1.5:
   version "2.1.6"