Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Jun 4, 2019
1 parent 51becb5 commit b56bb28
Show file tree
Hide file tree
Showing 19 changed files with 56 additions and 49 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"app-builder-bin": "2.6.6",
"archiver": "^3.0.0",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.8",
"bluebird-lst": "^1.0.9",
"chalk": "^2.4.2",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.11",
"fs-extra-p": "^8.0.0",
"fs-extra-p": "^8.0.2",
"hosted-git-info": "^2.7.1",
"iconv-lite": "^0.4.24",
"ini": "^1.3.5",
Expand All @@ -66,7 +66,9 @@
"temp-file": "^3.3.2",
"tunnel-agent": "^0.6.0",
"update-notifier": "^3.0.0",
"yargs": "^13.2.4"
"yargs": "^13.2.4",
"@types/debug": "^4.1.4",
"@types/semver": "^6.0.0"
},
"devDependencies": {
"@babel/core": "^7.4.5",
Expand All @@ -88,7 +90,6 @@
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"@types/debug": "^4.1.4",
"@types/ejs": "^2.6.3",
"@types/ini": "^1.3.30",
"@types/jest": "^24.0.13",
Expand All @@ -97,7 +98,6 @@
"@types/node-emoji": "^1.8.1",
"@types/sanitize-filename": "^1.1.28",
"@types/sax": "^1.2.0",
"@types/semver": "^6.0.0",
"@types/source-map-support": "^0.5.0",
"@types/stat-mode": "^0.2.0",
"@types/yargs": "^13.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"7zip-bin": "~4.1.0",
"app-builder-bin": "2.6.6",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.8",
"bluebird-lst": "^1.0.9",
"chromium-pickle-js": "^0.2.0",
"builder-util-runtime": "0.0.0-semantic-release",
"builder-util": "0.0.0-semantic-release",
"electron-osx-sign": "0.4.11",
"electron-publish": "0.0.0-semantic-release",
"fs-extra-p": "^8.0.0",
"fs-extra-p": "^8.0.2",
"hosted-git-info": "^2.7.1",
"is-ci": "^2.0.0",
"isbinaryfile": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/builder-util-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"dependencies": {
"debug": "^4.1.1",
"fs-extra-p": "^8.0.0",
"bluebird-lst": "^1.0.8",
"fs-extra-p": "^8.0.2",
"bluebird-lst": "^1.0.9",
"sax": "^1.2.4"
},
"types": "./out/index.d.ts"
Expand Down
4 changes: 2 additions & 2 deletions packages/builder-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"dependencies": {
"app-builder-bin": "2.6.6",
"temp-file": "^3.3.2",
"fs-extra-p": "^8.0.0",
"fs-extra-p": "^8.0.2",
"is-ci": "^2.0.0",
"stat-mode": "^0.3.0",
"bluebird-lst": "^1.0.8",
"bluebird-lst": "^1.0.9",
"chalk": "^2.4.2",
"debug": "^4.1.1",
"builder-util-runtime": "^0.0.0-semantic-release",
Expand Down
4 changes: 2 additions & 2 deletions packages/dmg-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"vendor"
],
"dependencies": {
"fs-extra-p": "^8.0.0",
"bluebird-lst": "^1.0.8",
"fs-extra-p": "^8.0.2",
"bluebird-lst": "^1.0.9",
"parse-color": "^1.0.0",
"builder-util": "~0.0.0-semantic-release",
"iconv-lite": "^0.4.24",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder-squirrel-windows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
],
"dependencies": {
"builder-util": "~0.0.0-semantic-release",
"bluebird-lst": "^1.0.8",
"fs-extra-p": "^8.0.0",
"bluebird-lst": "^1.0.9",
"fs-extra-p": "^8.0.2",
"archiver": "^3.0.0",
"sanitize-filename": "^1.6.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"bugs": "https://github.com/electron-userland/electron-builder/issues",
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"bluebird-lst": "^1.0.8",
"bluebird-lst": "^1.0.9",
"chalk": "^2.4.2",
"builder-util-runtime": "0.0.0-semantic-release",
"builder-util": "0.0.0-semantic-release",
"fs-extra-p": "^8.0.0",
"fs-extra-p": "^8.0.2",
"is-ci": "^2.0.0",
"read-config-file": "3.2.2",
"sanitize-filename": "^1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
],
"dependencies": {
"lazy-val": "^1.0.4",
"fs-extra-p": "^8.0.0",
"fs-extra-p": "^8.0.2",
"mime": "^2.4.3",
"bluebird-lst": "^1.0.8",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "^0.0.0-semantic-release",
"builder-util": "~0.0.0-semantic-release",
"chalk": "^2.4.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"dependencies": {
"@types/semver": "^6.0.0",
"lazy-val": "^1.0.4",
"bluebird-lst": "^1.0.8",
"fs-extra-p": "^8.0.0",
"bluebird-lst": "^1.0.9",
"fs-extra-p": "^8.0.2",
"js-yaml": "^3.13.1",
"semver": "^6.1.1",
"source-map-support": "^0.5.12",
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async function main() {
}
}

if (changed) {
if (changed && Object.keys(packageData).length !== 0) {
return await fs.writeJson(packageFile, packageData, {spaces: 2})
}
})
Expand Down
4 changes: 2 additions & 2 deletions test/src/BuildTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { walk } from "builder-util/out/fs"
import { Arch, createTargets, DIR_TARGET, Platform } from "electron-builder"
import { checkBuildRequestOptions } from "app-builder-lib"
import { readAsar } from "app-builder-lib/out/asar/asar"
import { move, outputJson, readFileSync } from "fs-extra-p"
import { outputJson, readFileSync, rename } from "fs-extra-p"
import * as path from "path"
import { doMergeConfigs } from "app-builder-lib/out/util/config"
import { app, appTwo, appTwoThrows, assertPack, linuxDirTarget, modifyPackageJson, packageJson } from "./helpers/packTester"
Expand Down Expand Up @@ -180,7 +180,7 @@ test.ifDevOrLinuxCi("electron version from build", app({
test("www as default dir", appTwo({
targets: Platform.LINUX.createTarget(DIR_TARGET),
}, {
projectDirCreated: projectDir => move(path.join(projectDir, "app"), path.join(projectDir, "www"))
projectDirCreated: projectDir => rename(path.join(projectDir, "app"), path.join(projectDir, "www"))
}))

test.ifLinuxOrDevMac("afterPack", () => {
Expand Down
4 changes: 2 additions & 2 deletions test/src/ExtraBuildTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Arch, build, PackagerOptions, Platform } from "electron-builder"
import { move } from "fs-extra-p"
import { rename } from "fs-extra-p"
import * as path from "path"
import { assertThat } from "./helpers/fileAssert"
import { app, assertPack, linuxDirTarget, modifyPackageJson } from "./helpers/packTester"
Expand All @@ -26,7 +26,7 @@ function createBuildResourcesTest(packagerOptions: PackagerOptions) {
packed: async context => {
await assertThat(path.join(context.projectDir, "customDist", "latest")).isDirectory()
},
projectDirCreated: projectDir => move(path.join(projectDir, "build"), path.join(projectDir, "custom"))
projectDirCreated: projectDir => rename(path.join(projectDir, "build"), path.join(projectDir, "custom"))
})
}

Expand Down
4 changes: 2 additions & 2 deletions test/src/filesTest.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DIR_TARGET, Platform } from "electron-builder"
import { TmpDir } from "builder-util"
import { copyDir } from "builder-util/out/fs"
import { outputFile, readFile, move, stat, symlink } from "fs-extra-p"
import { mkdirs, outputFile, readFile, rename, stat, symlink } from "fs-extra-p"
import * as path from "path"
import Mode, { Permissions } from "stat-mode"
import { assertThat } from "./helpers/fileAssert"
Expand Down Expand Up @@ -56,7 +56,7 @@ test.ifDevOrLinuxCi("files.from asar", app({
},
}, {
projectDirCreated: projectDir => Promise.all([
move(path.join(projectDir, "index.js"), path.join(projectDir, "app/node/index.js")),
mkdirs(path.join(projectDir, "app/node")).then(() => rename(path.join(projectDir, "index.js"), path.join(projectDir, "app/node/index.js"))),
modifyPackageJson(projectDir, data => {
data.main = "app/node/index.js"
})
Expand Down
2 changes: 1 addition & 1 deletion test/src/helpers/packTester.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export async function assertPack(fixtureName: string, packagerOptions: PackagerO
configuration.cscLink = WIN_CSC_LINK
configuration.cscKeyPassword = ""
}
else if (configuration == null || (configuration as Configuration).cscLink == null) {
else if ((configuration as Configuration).cscLink == null) {
packagerOptions = deepAssign({}, packagerOptions, {config: {mac: {identity: null}}})
}

Expand Down
4 changes: 2 additions & 2 deletions test/src/linux/linuxPackagerTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Arch, build, Platform } from "electron-builder"
import { copyFile, move, outputFile, remove, rename } from "fs-extra-p"
import { copyFile, mkdirs, outputFile, remove, rename } from "fs-extra-p"
import * as path from "path"
import { GenericServerOptions } from "builder-util-runtime"
import { assertThat } from "../helpers/fileAssert"
Expand Down Expand Up @@ -125,7 +125,7 @@ test.ifNotWindows("icons from ICNS (mac)", app({
},
}, {
projectDirCreated: async projectDir => {
await move(path.join(projectDir, "build", "icon.icns"), path.join(projectDir, "resources", "time.icns"))
await mkdirs(path.join(projectDir, "resources")).then(() => rename(path.join(projectDir, "build", "icon.icns"), path.join(projectDir, "resources", "time.icns")))
await remove(path.join(projectDir, "build"))
},
packed: async context => {
Expand Down
10 changes: 5 additions & 5 deletions test/src/mac/macIconTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DIR_TARGET, Platform } from "electron-builder"
import { copy, move, remove, unlink } from "fs-extra-p"
import { copyFile, rename, remove, unlink } from "fs-extra-p"
import * as path from "path"
import { CheckingMacPackager } from "../helpers/CheckingPackager"
import { app } from "../helpers/packTester"
Expand Down Expand Up @@ -43,7 +43,7 @@ test.ifMac.ifAll("custom icon set", () => {
projectDirCreated: projectDir => Promise.all([
unlink(path.join(projectDir, "build", "icon.icns")),
unlink(path.join(projectDir, "build", "icon.ico")),
move(path.join(projectDir, "build", "icons"), path.join(projectDir, "customIconSet")),
rename(path.join(projectDir, "build", "icons"), path.join(projectDir, "customIconSet")),
]),
packed: () => assertIcon(platformPackager!!),
})()
Expand All @@ -63,8 +63,8 @@ test.ifMac.ifAll("custom icon set with only 512 and 128", () => {
projectDirCreated: projectDir => Promise.all([
unlink(path.join(projectDir, "build", "icon.icns")),
unlink(path.join(projectDir, "build", "icon.ico")),
copy(path.join(projectDir, "build", "icons", "512x512.png"), path.join(projectDir, "512x512.png")),
copy(path.join(projectDir, "build", "icons", "128x128.png"), path.join(projectDir, "128x128.png")),
copyFile(path.join(projectDir, "build", "icons", "512x512.png"), path.join(projectDir, "512x512.png")),
copyFile(path.join(projectDir, "build", "icons", "128x128.png"), path.join(projectDir, "128x128.png")),
]),
packed: () => assertIcon(platformPackager!!),
})()
Expand Down Expand Up @@ -98,7 +98,7 @@ test.ifMac.ifAll("default png icon", () => {
projectDirCreated: projectDir => Promise.all([
unlink(path.join(projectDir, "build", "icon.icns")),
unlink(path.join(projectDir, "build", "icon.ico")),
copy(path.join(projectDir, "build", "icons", "512x512.png"), path.join(projectDir, "build", "icon.png"))
copyFile(path.join(projectDir, "build", "icons", "512x512.png"), path.join(projectDir, "build", "icon.png"))
.then(() => remove(path.join(projectDir, "build", "icons")))
]),
packed: () => assertIcon(platformPackager!!),
Expand Down
4 changes: 2 additions & 2 deletions test/src/mainEntryTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createTargets, DIR_TARGET, Platform } from "electron-builder"
import { move } from "fs-extra-p"
import { rename } from "fs-extra-p"
import * as path from "path"
import { appTwoThrows, assertPack, modifyPackageJson } from "./helpers/packTester"

Expand Down Expand Up @@ -42,7 +42,7 @@ test.ifLinuxOrDevMac("invalid main in the app package.json (custom asar)", appTw
test.ifLinuxOrDevMac("main in the app package.json (no asar)", () => assertPack("test-app", packagerOptions, {
projectDirCreated: projectDir => {
return Promise.all([
move(path.join(projectDir, "app", "index.js"), path.join(projectDir, "app", "main.js")),
rename(path.join(projectDir, "app", "index.js"), path.join(projectDir, "app", "main.js")),
modifyPackageJson(projectDir, data => {
data.main = "main.js"
}, true),
Expand Down
4 changes: 2 additions & 2 deletions test/src/windows/oneClickInstallerTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Arch, Platform } from "electron-builder"
import { copy, writeFile } from "fs-extra-p"
import { copyFile, writeFile } from "fs-extra-p"
import * as path from "path"
import { assertThat } from "../helpers/fileAssert"
import { app, assertPack, copyTestAsset, modifyPackageJson } from "../helpers/packTester"
Expand Down Expand Up @@ -164,7 +164,7 @@ test.skip("big file pack", app(
},
}, {
projectDirCreated: async projectDir => {
await copy("/Volumes/Pegasus/15.02.18.m4v", path.join(projectDir, "foo/bar/video.mov"))
await copyFile("/Volumes/Pegasus/15.02.18.m4v", path.join(projectDir, "foo/bar/video.mov"))
},
}))

Expand Down
25 changes: 16 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1629,14 +1629,21 @@ bl@^1.0.0:
readable-stream "^2.3.5"
safe-buffer "^5.1.1"

bluebird-lst@^1.0.5, bluebird-lst@^1.0.6, bluebird-lst@^1.0.7, bluebird-lst@^1.0.8:
bluebird-lst@^1.0.5, bluebird-lst@^1.0.6, bluebird-lst@^1.0.7:
version "1.0.8"
resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4"
integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==
dependencies:
bluebird "^3.5.4"

bluebird@^3.5.0, bluebird@^3.5.4:
bluebird-lst@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==
dependencies:
bluebird "^3.5.5"

bluebird@^3.5.0, bluebird@^3.5.4, bluebird@^3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
Expand Down Expand Up @@ -2720,13 +2727,13 @@ fs-extra-p@^7.0.0, fs-extra-p@^7.0.1:
bluebird-lst "^1.0.7"
fs-extra "^7.0.1"

fs-extra-p@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-8.0.0.tgz#ae1bdee9c6a97c5b552c29f9e2188021bf10c651"
integrity sha512-gP+HIe9Hyc+NuDcDm+wn4+s+0+WUPFFK89Uf9HogsRZeHwwKkyXUJi8FDdxf4bpr2+4/01kB3JUr2O54FS9UlQ==
fs-extra-p@^8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-8.0.2.tgz#3b8e03ad963358570b70a152b2ee8d1c9eed5bf4"
integrity sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==
dependencies:
bluebird-lst "^1.0.8"
fs-extra "^8.0.0"
bluebird-lst "^1.0.9"
fs-extra "^8.0.1"

fs-extra@^6.0.1:
version "6.0.1"
Expand All @@ -2746,7 +2753,7 @@ fs-extra@^7.0.1:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^8.0.0:
fs-extra@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b"
integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==
Expand Down

0 comments on commit b56bb28

Please sign in to comment.