Skip to content

Commit 8c79f60

Browse files
develardevelar
committed
fix: do not use scoped electron-download
Close #1458
1 parent 2ab769d commit 8c79f60

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
"///": "all dependencies for all packages (hoisted)",
2929
"dependencies": {
3030
"7zip-bin": "^2.0.4",
31-
"@electron-builder/electron-download": "4.2.1",
3231
"ajv": "^5.0.4-beta.2",
3332
"ajv-keywords": "^2.0.1-beta.2",
3433
"archiver": "^1.3.0",
35-
"aws-sdk": "^2.40.0",
34+
"aws-sdk": "^2.41.0",
3635
"bluebird-lst": "^1.0.2",
3736
"chalk": "^1.1.3",
3837
"chromium-pickle-js": "^0.2.0",
3938
"cuint": "^0.2.2",
4039
"debug": "^2.6.3",
40+
"electron-download-tf": "4.2.1",
4141
"electron-is-dev": "^0.1.2",
4242
"electron-osx-sign": "0.4.4",
4343
"fs-extra-p": "^4.1.0",
@@ -89,8 +89,8 @@
8989
"path-sort": "^0.1.0",
9090
"source-map-support": "^0.4.14",
9191
"ts-babel": "^3.0.0",
92-
"tslint": "^5.0.0",
93-
"typescript": "^2.2.2",
92+
"tslint": "^5.1.0",
93+
"typescript": "^2.3.0",
9494
"whitespace": "^2.1.0",
9595
"xml2js": "^0.4.17"
9696
},

‎packages/electron-builder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"electron-builder-core": "0.0.0-semantic-release",
5555
"electron-builder-http": "0.0.0-semantic-release",
5656
"electron-builder-util": "0.0.0-semantic-release",
57-
"@electron-builder/electron-download": "4.2.1",
57+
"electron-download-tf": "4.2.1",
5858
"electron-osx-sign": "0.4.4",
5959
"electron-publish": "0.0.0-semantic-release",
6060
"fs-extra-p": "^4.1.0",

‎packages/electron-builder/src/packager/dirPackager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { chmod, emptyDir } from "fs-extra-p"
77
import * as path from "path"
88
import { PlatformPackager } from "../platformPackager"
99

10-
const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("@electron-builder/electron-download"))
10+
const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("electron-download-tf"))
1111

1212
function createDownloadOpts(opts: any, platform: string, arch: string, electronVersion: string) {
1313
if (opts.download != null) {

‎packages/electron-publisher-s3/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"dependencies": {
1414
"fs-extra-p": "^4.1.0",
15-
"aws-sdk": "^2.40.0",
15+
"aws-sdk": "^2.41.0",
1616
"mime": "^1.3.4",
1717
"electron-publish": "~0.0.0-semantic-release",
1818
"electron-builder-util": "~0.0.0-semantic-release"

‎packages/electron-updater/src/PrivateGitHubProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class PrivateGitHubProvider extends BaseGitHubProvider<PrivateGitHubUpdat
117117
}
118118
else {
119119
const name = versionInfo.githubArtifactName || path.posix.basename(versionInfo.path).replace(/ /g, "-")
120-
return {
120+
return <any>{
121121
name: name,
122122
url: versionInfo.assets.find(it => it.name == name)!.url,
123123
sha2: versionInfo.sha2,

‎test/out/linux/__snapshots__/snapTest.js.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`default stagePackages 1`] = `
44
Object {
55
"apps": Object {
66
"sep": Object {
7-
"command": "desktop-launch $SNAP/sep",
7+
"command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
88
"plugs": Array [
99
"home",
1010
"x11",
@@ -56,7 +56,7 @@ exports[`default stagePackages 3`] = `
5656
Object {
5757
"apps": Object {
5858
"sep": Object {
59-
"command": "desktop-launch $SNAP/sep",
59+
"command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
6060
"plugs": Array [
6161
"home",
6262
"x11",
@@ -110,7 +110,7 @@ exports[`default stagePackages 5`] = `
110110
Object {
111111
"apps": Object {
112112
"sep": Object {
113-
"command": "desktop-launch $SNAP/sep",
113+
"command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
114114
"plugs": Array [
115115
"custom",
116116
"home",
@@ -164,7 +164,7 @@ exports[`default stagePackages 7`] = `
164164
Object {
165165
"apps": Object {
166166
"sep": Object {
167-
"command": "desktop-launch $SNAP/sep",
167+
"command": "env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/sep",
168168
"plugs": Array [
169169
"foo1",
170170
"home",

‎test/src/helpers/runTests.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ELECTRON_VERSION, TEST_DIR } from "./config"
99
const util = require("../../../packages/electron-builder-util/out/util")
1010
const isEmptyOrSpaces = util.isEmptyOrSpaces
1111

12-
const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("@electron-builder/electron-download"))
12+
const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisify(require("electron-download-tf"))
1313

1414
runTests()
1515
.catch(error => {

‎yarn.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,6 @@
3131
typescript "~2.1.5"
3232
yargs "^7.0.2"
3333

34-
"@electron-builder/electron-download@4.2.1":
35-
version "4.2.1"
36-
resolved "https://registry.yarnpkg.com/@electron-builder/electron-download/-/electron-download-4.2.1.tgz#b10b7b077523ae2f6c21dc05658df145d716c223"
37-
dependencies:
38-
debug "^2.6.3"
39-
env-paths "^1.0.0"
40-
fs-extra "^2.1.2"
41-
minimist "^1.2.0"
42-
nugget "^2.0.1"
43-
path-exists "^3.0.0"
44-
rc "^1.2.1"
45-
semver "^5.3.0"
46-
sumchecker "^2.0.2"
47-
4834
"@types/electron@^1.4.35":
4935
version "1.4.35"
5036
resolved "https://registry.yarnpkg.com/@types/electron/-/electron-1.4.35.tgz#48e5e6ef0b49f27b9f78b87d80f796e3f0a4f33c"
@@ -294,9 +280,9 @@ asynckit@^0.4.0:
294280
version "0.4.0"
295281
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
296282

297-
aws-sdk@^2.40.0:
298-
version "2.40.0"
299-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.40.0.tgz#7af7410f0484c9ae0742017e217b39917ebbf8d0"
283+
aws-sdk@^2.41.0:
284+
version "2.41.0"
285+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.41.0.tgz#930c15ae7ef4532bb8912c4c36a18b0023fd74c2"
300286
dependencies:
301287
buffer "4.9.1"
302288
crypto-browserify "1.0.9"
@@ -1078,6 +1064,20 @@ ecc-jsbn@~0.1.1:
10781064
dependencies:
10791065
jsbn "~0.1.0"
10801066

1067+
electron-download-tf@4.2.1:
1068+
version "4.2.1"
1069+
resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.2.1.tgz#d16d2e4c29fc681c10ce42235c629cd812533884"
1070+
dependencies:
1071+
debug "^2.6.3"
1072+
env-paths "^1.0.0"
1073+
fs-extra "^2.1.2"
1074+
minimist "^1.2.0"
1075+
nugget "^2.0.1"
1076+
path-exists "^3.0.0"
1077+
rc "^1.2.1"
1078+
semver "^5.3.0"
1079+
sumchecker "^2.0.2"
1080+
10811081
electron-is-dev@^0.1.2:
10821082
version "0.1.2"
10831083
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:
32003200
fs-extra-p "^4.1.0"
32013201
source-map-support "^0.4.14"
32023202

3203-
tslint@^5.0.0:
3204-
version "5.0.0"
3205-
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.0.0.tgz#ad3b7952f8a9b21079248bee01c2eaf92167e185"
3203+
tslint@^5.1.0:
3204+
version "5.1.0"
3205+
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.1.0.tgz#51a47baeeb58956fcd617bd2cf00e2ef0eea2ed9"
32063206
dependencies:
32073207
babel-code-frame "^6.22.0"
32083208
colors "^1.1.2"
@@ -3235,8 +3235,8 @@ type-check@~0.3.2:
32353235
prelude-ls "~1.1.2"
32363236

32373237
typescript@^2.2.2:
3238-
version "2.2.2"
3239-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
3238+
version "2.3.0"
3239+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418"
32403240

32413241
typescript@~2.1.5:
32423242
version "2.1.6"

0 commit comments

Comments
 (0)