Skip to content

Commit e208f53

Browse files
develardevelar
committed
fix: one file in asar archive got corrupted
Close #1400
1 parent 4241521 commit e208f53

File tree

6 files changed

+47
-43
lines changed

6 files changed

+47
-43
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"whitespace": "whitespace 'src/**/*.ts'",
1616
"docker-images": "docker/build.sh",
1717
"test-deps-mac": "brew install rpm dpkg mono lzip gnu-tar graphicsmagick xz && brew install wine --without-x11",
18-
"update-deps": "lerna exec -- npm-check-updates --reject 'electron-builder-http,electron-builder-util,electron-builder-core,electron-publish' -a",
18+
"update-deps": "lerna exec -- npm-check-updates --reject 'electron-builder-http,electron-builder-util,electron-builder-core,electron-publish,electron-forge-maker-' -a",
1919
"set-versions": "node test/out/helpers/setVersions.js",
2020
"npm-publish": "yarn compile && ./packages/npm-publish.sh && conventional-changelog -p angular -i CHANGELOG.md -s",
2121
"schema": "typescript-json-schema packages/electron-builder/tsconfig.json Config --out packages/electron-builder/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks",
@@ -31,7 +31,7 @@
3131
"ajv": "^5.0.4-beta.0",
3232
"ajv-keywords": "^2.0.1-beta.2",
3333
"archiver": "^1.3.0",
34-
"aws-sdk": "^2.30.0",
34+
"aws-sdk": "^2.31.0",
3535
"bluebird-lst": "^1.0.2",
3636
"chalk": "^1.1.3",
3737
"chromium-pickle-js": "^0.2.0",
@@ -67,7 +67,7 @@
6767
"@types/ini": "^1.3.29",
6868
"@types/jest": "^19.2.2",
6969
"@types/js-yaml": "^3.5.29",
70-
"@types/node-forge": "^0.6.7",
70+
"@types/node-forge": "^0.6.8",
7171
"@types/source-map-support": "^0.2.28",
7272
"@types/xml2js": "^0.0.33",
7373
"babel-plugin-array-includes": "^2.0.3",

‎packages/electron-builder/src/asarUtil.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,19 @@ export class AsarPackager {
247247

248248
const w = (index: number) => {
249249
let data
250-
while (index < files.length && (data = transformedFiles[index++]) == null) {
251-
}
252-
253-
if (index >= files.length) {
254-
writeStream.end()
255-
return
250+
while (true) {
251+
if (index >= files.length) {
252+
writeStream.end()
253+
return
254+
}
255+
256+
if ((data = transformedFiles[index++]) != null) {
257+
break
258+
}
256259
}
257260

258261
const file = files[index - 1]
259-
if (data !== true && data != null) {
262+
if (data !== true) {
260263
writeStream.write(data, () => w(index))
261264
return
262265
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,6 @@ function checkDependencies(dependencies: { [key: string]: string } | null | unde
500500
+ `Please remove it from the "dependencies" section in your package.json.`)
501501
}
502502
}
503-
if ("electron-compile" in dependencies) {
504-
warn(`Package "electron-compile" should be in "devDependencies". `
505-
+ `Please remove it from the "dependencies" section in your package.json. Please see https://github.com/electron/electron-compile/issues/207`)
506-
}
507503
}
508504

509505
export interface BuildResult {

‎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.30.0",
15+
"aws-sdk": "^2.31.0",
1616
"mime": "^1.3.4",
1717
"electron-publish": "~0.0.0-semantic-release",
1818
"electron-builder-util": "~0.0.0-semantic-release"

‎packages/lint.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ const options = {
6767

6868
let hasErrors = false
6969
for (const projectDir of require("./process").getPackages()) {
70+
if (projectDir.includes("electron-forge-maker-")) {
71+
continue
72+
}
73+
7074
console.log(`Linting ${path.basename(projectDir)}`)
7175
const program = Linter.createProgram("tsconfig.json", projectDir)
7276
for (const file of Linter.getFileNames(program)) {

‎yarn.lock

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
version "3.5.29"
4141
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.5.29.tgz#29f4dd9314fbccb080d8bd84b9c23811ec5090c2"
4242

43-
"@types/node-forge@^0.6.7":
44-
version "0.6.7"
45-
resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.6.7.tgz#c63dadba64c10e3b90b473c9f16641c43ec26a29"
43+
"@types/node-forge@^0.6.8":
44+
version "0.6.8"
45+
resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.6.8.tgz#fb38ae420be9c9b679bed3f974201120947b920f"
4646

4747
"@types/node@*":
48-
version "7.0.8"
49-
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.8.tgz#25e4dd804b630c916ae671233e6d71f6ce18124a"
48+
version "7.0.10"
49+
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.10.tgz#d860abb18c1b58b552c7c6cd8b2ba7adf6546fa3"
5050

5151
"@types/source-map-support@^0.2.28":
5252
version "0.2.28"
@@ -271,9 +271,9 @@ asynckit@^0.4.0:
271271
version "0.4.0"
272272
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
273273

274-
aws-sdk@^2.30.0:
275-
version "2.30.0"
276-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.30.0.tgz#9d6d3b665e18fb7b9b9481092ea4d1ee1bfeed63"
274+
aws-sdk@^2.31.0:
275+
version "2.31.0"
276+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.31.0.tgz#e17480610ebddad57732918a4849f9e5f4ade44d"
277277
dependencies:
278278
buffer "4.9.1"
279279
crypto-browserify "1.0.9"
@@ -407,12 +407,12 @@ babel-plugin-array-includes@^2.0.3:
407407
resolved "https://registry.yarnpkg.com/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz#cf5452e81c7b803fb7959f1045ac88e2ec28ff76"
408408

409409
babel-plugin-istanbul@^4.0.0:
410-
version "4.0.0"
411-
resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10"
410+
version "4.1.1"
411+
resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9"
412412
dependencies:
413413
find-up "^2.1.0"
414-
istanbul-lib-instrument "^1.4.2"
415-
test-exclude "^4.0.0"
414+
istanbul-lib-instrument "^1.6.2"
415+
test-exclude "^4.0.3"
416416

417417
babel-plugin-jest-hoist@^19.0.0:
418418
version "19.0.0"
@@ -1626,9 +1626,9 @@ isbinaryfile@^3.0.2:
16261626
version "3.0.2"
16271627
resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
16281628

1629-
isexe@^1.1.1:
1630-
version "1.1.2"
1631-
resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
1629+
isexe@^2.0.0:
1630+
version "2.0.0"
1631+
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
16321632

16331633
isobject@^2.0.0:
16341634
version "2.1.0"
@@ -1641,14 +1641,14 @@ isstream@~0.1.2:
16411641
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
16421642

16431643
istanbul-api@^1.1.0-alpha.1:
1644-
version "1.1.5"
1645-
resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.5.tgz#3ddb38f11183196da8f6e5c90c938cd3917b16a7"
1644+
version "1.1.6"
1645+
resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.6.tgz#23aa5b5b9b1b3bdbb786f039160e91acbe495433"
16461646
dependencies:
16471647
async "^2.1.4"
16481648
fileset "^2.0.2"
16491649
istanbul-lib-coverage "^1.0.0"
16501650
istanbul-lib-hook "^1.0.4"
1651-
istanbul-lib-instrument "^1.6.1"
1651+
istanbul-lib-instrument "^1.6.2"
16521652
istanbul-lib-report "^1.0.0-alpha.3"
16531653
istanbul-lib-source-maps "^1.1.0"
16541654
istanbul-reports "^1.0.0"
@@ -1666,9 +1666,9 @@ istanbul-lib-hook@^1.0.4:
16661666
dependencies:
16671667
append-transform "^0.4.0"
16681668

1669-
istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.6.1:
1670-
version "1.6.1"
1671-
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.1.tgz#6c9c3191ebd5aa856d66dc2f0b2f719c3732de2d"
1669+
istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.6.2:
1670+
version "1.6.2"
1671+
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b"
16721672
dependencies:
16731673
babel-generator "^6.18.0"
16741674
babel-template "^6.16.0"
@@ -3070,7 +3070,7 @@ term-size@^0.1.0:
30703070
dependencies:
30713071
execa "^0.4.0"
30723072

3073-
test-exclude@^4.0.0:
3073+
test-exclude@^4.0.3:
30743074
version "4.0.3"
30753075
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7"
30763076
dependencies:
@@ -3231,12 +3231,13 @@ typical@^2.4.2, typical@^2.6.0:
32313231
resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.0.tgz#89d51554ab139848a65bcc2c8772f8fb450c40ed"
32323232

32333233
uglify-js@^2.6:
3234-
version "2.8.14"
3235-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.14.tgz#25b15d1af39b21752ee33703adbf432e8bc8f77d"
3234+
version "2.8.15"
3235+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.15.tgz#835dd4cd5872554756e6874508d0d0561704d94d"
32363236
dependencies:
32373237
source-map "~0.5.1"
3238-
uglify-to-browserify "~1.0.0"
32393238
yargs "~3.10.0"
3239+
optionalDependencies:
3240+
uglify-to-browserify "~1.0.0"
32403241

32413242
uglify-js@~2.3:
32423243
version "2.3.6"
@@ -3390,10 +3391,10 @@ which-module@^1.0.0:
33903391
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
33913392

33923393
which@^1.1.1, which@^1.2.12, which@^1.2.8:
3393-
version "1.2.12"
3394-
resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
3394+
version "1.2.14"
3395+
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
33953396
dependencies:
3396-
isexe "^1.1.1"
3397+
isexe "^2.0.0"
33973398

33983399
whitespace@^2.1.0:
33993400
version "2.1.0"

0 commit comments

Comments
 (0)