Skip to content

Commit 686dc6b

Browse files
develardevelar
committed
fix: use own copy of bluebird library (scoped)
1 parent 99a5f0a commit 686dc6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+122
-115
lines changed

‎nsis-auto-updater/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"out"
1313
],
1414
"dependencies": {
15-
"bluebird": "^3.4.6",
16-
"fs-extra-p": "^1.2.0",
15+
"bluebird-lst-c": "^1.0.2",
16+
"fs-extra-p": "^2.0.3",
1717
"ini": "^1.3.4",
1818
"js-yaml": "^3.6.1",
1919
"semver": "^5.3.0",

‎nsis-auto-updater/src/NsisUpdater.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ import { gt as isVersionGreaterThan, valid as parseVersion } from "semver"
66
import { download } from "../../src/util/httpRequest"
77
import { Provider, UpdateCheckResult } from "./api"
88
import { BintrayProvider } from "./BintrayProvider"
9-
import BluebirdPromise from "bluebird"
9+
import BluebirdPromise from "bluebird-lst-c"
1010
import { BintrayOptions, PublishConfiguration, GithubOptions } from "../../src/options/publishOptions"
1111
import { readFile } from "fs-extra-p"
1212
import { safeLoad } from "js-yaml"
1313

14-
BluebirdPromise.config({
15-
longStackTraces: true,
16-
cancellation: true
17-
})
18-
1914
export class NsisUpdater extends EventEmitter {
2015
private setupPath: string | null
2116

‎nsis-auto-updater/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"../typings/semver.d.ts",
2323
"../node_modules/@types/node/index.d.ts",
2424
"../node_modules/fs-extra-p/index.d.ts",
25-
"../node_modules/@develar/types/bluebird.d.ts",
25+
"../node_modules/bluebird-lst-c/index.d.ts",
2626
"../src/util/httpRequest.ts",
2727
"../src/publish/restApiRequest.ts",
2828
"../src/publish/restApiRequest.ts",

‎nsis-auto-updater/yarn.lock

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ balanced-match@^0.4.1:
1010
version "0.4.2"
1111
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
1212

13+
bluebird-lst-c@^1.0.2:
14+
version "1.0.2"
15+
resolved "https://registry.yarnpkg.com/bluebird-lst-c/-/bluebird-lst-c-1.0.2.tgz#b9800c878d83bda4630f5ffbc0e39cc5f8a193e7"
16+
dependencies:
17+
bluebird "^3.4.6"
18+
1319
bluebird@^3.4.6:
1420
version "3.4.6"
1521
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
@@ -29,20 +35,20 @@ esprima@^2.6.0:
2935
version "2.7.3"
3036
resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
3137

32-
fs-extra-p@^1.2.0:
33-
version "1.2.0"
34-
resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-1.2.0.tgz#16abed58ec63219cf9244a5a54ba200d4864b347"
38+
fs-extra-p@^2.0.3:
39+
version "2.0.3"
40+
resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-2.0.3.tgz#570072384028c95193a158b4ff080be0200fd007"
3541
dependencies:
3642
bluebird "^3.4.6"
37-
fs-extra-tf "^0.30.3"
43+
fs-extra-tf "^0.30.4"
3844

39-
fs-extra-tf@^0.30.3:
40-
version "0.30.3"
41-
resolved "https://registry.yarnpkg.com/fs-extra-tf/-/fs-extra-tf-0.30.3.tgz#3099cc70fe571c695479bf12251c6fa2e21177ce"
45+
fs-extra-tf@^0.30.4:
46+
version "0.30.4"
47+
resolved "https://registry.yarnpkg.com/fs-extra-tf/-/fs-extra-tf-0.30.4.tgz#c31e0c83a92201bd948e788563e1c02f35583e8f"
4248
dependencies:
4349
graceful-fs "^4.1.9"
4450
jsonfile "^2.4.0"
45-
klaw "^1.3.0"
51+
klaw "^1.3.1"
4652
path-is-absolute "^1.0.1"
4753
rimraf "^2.5.4"
4854

@@ -93,9 +99,11 @@ jsonfile@^2.4.0:
9399
optionalDependencies:
94100
graceful-fs "^4.1.6"
95101

96-
klaw@^1.3.0:
97-
version "1.3.0"
98-
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.0.tgz#8857bfbc1d824badf13d3d0241d8bbe46fb12f73"
102+
klaw@^1.3.1:
103+
version "1.3.1"
104+
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
105+
optionalDependencies:
106+
graceful-fs "^4.1.9"
99107

100108
minimatch@^3.0.2:
101109
version "3.0.3"

‎package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262
"archiver": "^1.1.0",
6363
"archiver-utils": "^1.3.0",
6464
"asar-electron-builder": "^0.13.5",
65-
"bluebird": "^3.4.6",
65+
"bluebird-lst-c": "^1.0.2",
6666
"chalk": "^1.1.3",
6767
"chromium-pickle-js": "^0.2.0",
6868
"cli-cursor": "^1.0.2",
6969
"cuint": "^0.2.2",
7070
"debug": "^2.2.0",
7171
"electron-download": "2.1.2",
7272
"electron-osx-sign-tf": "^1.0.1",
73-
"fs-extra-p": "^1.2.0",
73+
"fs-extra-p": "^2.0.3",
7474
"hosted-git-info": "^2.1.5",
7575
"ini": "^1.3.4",
7676
"isbinaryfile": "^3.0.1",
@@ -94,16 +94,15 @@
9494
"yargs": "^6.3.0"
9595
},
9696
"devDependencies": {
97-
"@develar/semantic-release": "^6.3.10",
98-
"@develar/types": "^1.0.1",
97+
"@develar/semantic-release": "^6.3.11",
9998
"@types/ini": "^1.3.29",
10099
"@types/js-yaml": "^3.5.28",
101100
"@types/source-map-support": "^0.2.28",
102101
"ava-tf": "^0.16.4",
103102
"babel-plugin-array-includes": "^2.0.3",
104103
"babel-plugin-transform-async-to-module-method": "^6.16.0",
105-
"babel-plugin-transform-es2015-destructuring": "^6.16.0",
106-
"babel-plugin-transform-es2015-parameters": "^6.17.0",
104+
"babel-plugin-transform-es2015-destructuring": "^6.18.0",
105+
"babel-plugin-transform-es2015-parameters": "^6.18.0",
107106
"babel-plugin-transform-es2015-spread": "^6.8.0",
108107
"babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
109108
"decompress-zip": "^0.3.0",
@@ -112,7 +111,7 @@
112111
"husky": "^0.11.9",
113112
"json8": "^0.9.2",
114113
"path-sort": "^0.1.0",
115-
"ts-babel": "^1.1.2",
114+
"ts-babel": "^1.1.3",
116115
"tslint": "^4.0.0-dev.0",
117116
"typescript": "^2.1.0-dev.20161025",
118117
"validate-commit-msg": "^2.8.2",
@@ -123,7 +122,7 @@
123122
[
124123
"transform-async-to-module-method",
125124
{
126-
"module": "bluebird",
125+
"module": "bluebird-lst-c",
127126
"method": "coroutine"
128127
}
129128
],

‎src/asarUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
lstat, readdir, readFile, Stats, createWriteStream, ensureDir, createReadStream, readJson,
55
writeFile, realpath
66
} from "fs-extra-p"
7-
import BluebirdPromise from "bluebird"
7+
import BluebirdPromise from "bluebird-lst-c"
88
import * as path from "path"
99
import { log } from "./util/log"
1010
import { Minimatch } from "minimatch"

‎src/builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { PackagerOptions, getPublishConfigs, getResolvedPublishConfig } from "./
33
import { PublishOptions, Publisher } from "./publish/publisher"
44
import { GitHubPublisher } from "./publish/gitHubPublisher"
55
import { executeFinally } from "./util/promise"
6-
import BluebirdPromise from "bluebird"
6+
import BluebirdPromise from "bluebird-lst-c"
77
import { isEmptyOrSpaces, isCi, debug } from "./util/util"
88
import { log } from "./util/log"
99
import { Platform, Arch, archFromString } from "./metadata"

‎src/cleanup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { homedir } from "os"
44
import { readdir, lstat, Stats, remove, readFile } from "fs-extra-p"
5-
import BluebirdPromise from "bluebird"
5+
import BluebirdPromise from "bluebird-lst-c"
66
import * as path from "path"
77

88
async function main() {

‎src/codeSign.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { deleteFile, outputFile, copy, rename } from "fs-extra-p"
33
import { download } from "./util/httpRequest"
44
import * as path from "path"
55
import { executeFinally, all } from "./util/promise"
6-
import BluebirdPromise from "bluebird"
6+
import BluebirdPromise from "bluebird-lst-c"
77
import { randomBytes } from "crypto"
88
import { homedir } from "os"
99
import { TmpDir } from "./util/tmp"

‎src/install-app-deps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { computeDefaultAppDirectory, installDependencies, getElectronVersion, use } from "./util/util"
44
import { printErrorAndExit } from "./util/promise"
55
import * as path from "path"
6-
import BluebirdPromise from "bluebird"
6+
import BluebirdPromise from "bluebird-lst-c"
77
import { DevMetadata } from "./metadata"
88
import yargs from "yargs"
99
import { readPackageJson } from "./util/readPackageJson"

0 commit comments

Comments
 (0)