From dcd0e179a04e4dc5fd7e9a46c64307819e00c424 Mon Sep 17 00:00:00 2001 From: develar Date: Sun, 7 May 2017 11:08:48 +0200 Subject: [PATCH] chore: update fs-extra to 3 --- .travis.yml | 2 +- circle.yml | 2 +- package.json | 9 +-- packages/electron-builder-http/package.json | 2 +- .../package.json | 2 +- packages/electron-builder-util/package.json | 2 +- packages/electron-builder/package.json | 4 +- packages/electron-publish/package.json | 2 +- packages/electron-publisher-s3/package.json | 2 +- packages/electron-updater/package.json | 2 +- test/src/helpers/runTests.ts | 3 +- yarn.lock | 63 ++++++++++--------- 12 files changed, 50 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a90595e86d..baa74fe4e99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: - node_modules - packages/electron-builder/node_modules - packages/electron-builder-util/node_modules - - $HOME/.electron + - $HOME/Library/Caches/electron - /tmp/jest-electron-builder-tests before_install: diff --git a/circle.yml b/circle.yml index a10dc64ff3c..ab486ac3c0c 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: cache_directories: - - "~/.cache/.electron" + - "~/.cache/electron" - "~/.cache/electron-builder" # https://discuss.circleci.com/t/installing-git-lfs/867 diff --git a/package.json b/package.json index 7b609ab8295..719209337da 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,10 @@ "chromium-pickle-js": "^0.2.0", "cuint": "^0.2.2", "debug": "^2.6.6", - "electron-download-tf": "4.2.1", + "electron-download-tf": "4.3.1", "electron-is-dev": "^0.1.2", "electron-osx-sign": "0.4.4", - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "hosted-git-info": "^2.4.2", "ini": "^1.3.4", "is-ci": "^1.0.10", @@ -56,7 +56,7 @@ "sanitize-filename": "^1.6.1", "semver": "^5.3.0", "stat-mode": "^0.2.2", - "ts-jsdoc": "^1.2.1", + "ts-jsdoc": "^1.2.2", "tunnel-agent": "^0.6.0", "update-notifier": "^2.1.0", "uuid-1345": "^0.99.6", @@ -82,6 +82,7 @@ "decompress-zip": "^0.3.0", "depcheck": "^0.6.7", "develar-typescript-json-schema": "0.11.0", + "env-paths": "^1.0.0", "globby": "^6.1.0", "jest-cli": "^20.0.0", "jest-environment-node-debug": "^2.0.0", @@ -89,7 +90,7 @@ "jsdoc-to-markdown": "^3.0.0", "path-sort": "^0.1.0", "source-map-support": "^0.4.15", - "ts-babel": "^3.0.0", + "ts-babel": "^3.0.1", "tslint": "^5.2.0", "typescript": "^2.3.2", "whitespace": "^2.1.0", diff --git a/packages/electron-builder-http/package.json b/packages/electron-builder-http/package.json index 0a6596a9b1a..c5ecbcc0fb5 100644 --- a/packages/electron-builder-http/package.json +++ b/packages/electron-builder-http/package.json @@ -13,7 +13,7 @@ "//": "client can also install js-yaml to load yaml", "dependencies": { "debug": "2.6.6", - "fs-extra-p": "^4.1.0" + "fs-extra-p": "^4.3.0" }, "typings": "./out/electron-builder-http.d.ts" } diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json index 5cf22d437aa..aa35f664875 100644 --- a/packages/electron-builder-squirrel-windows/package.json +++ b/packages/electron-builder-squirrel-windows/package.json @@ -14,7 +14,7 @@ "electron-builder-util": "~0.0.0-semantic-release", "electron-builder-core": "~0.0.0-semantic-release", "bluebird-lst": "^1.0.2", - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "archiver": "^1.3.0" }, "typings": "./out/electron-builder-squirrel-windows.d.ts" diff --git a/packages/electron-builder-util/package.json b/packages/electron-builder-util/package.json index 888a2c6602d..9ac1dd75bea 100644 --- a/packages/electron-builder-util/package.json +++ b/packages/electron-builder-util/package.json @@ -11,7 +11,7 @@ "out" ], "dependencies": { - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "is-ci": "^1.0.10", "stat-mode": "^0.2.2", "bluebird-lst": "^1.0.2", diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json index 420bc7470bd..21f66c1e569 100644 --- a/packages/electron-builder/package.json +++ b/packages/electron-builder/package.json @@ -54,10 +54,10 @@ "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-download-tf": "4.2.1", + "electron-download-tf": "4.3.1", "electron-osx-sign": "0.4.4", "electron-publish": "0.0.0-semantic-release", - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "hosted-git-info": "^2.4.2", "is-ci": "^1.0.10", "isbinaryfile": "^3.0.2", diff --git a/packages/electron-publish/package.json b/packages/electron-publish/package.json index 0a625988446..219e9401784 100644 --- a/packages/electron-publish/package.json +++ b/packages/electron-publish/package.json @@ -11,7 +11,7 @@ "out" ], "dependencies": { - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "mime": "^1.3.4", "bluebird-lst": "^1.0.2", "electron-builder-http": "~0.0.0-semantic-release", diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json index 07bc4541aa9..92cd680deea 100644 --- a/packages/electron-publisher-s3/package.json +++ b/packages/electron-publisher-s3/package.json @@ -11,7 +11,7 @@ "out", "s3-client" ], "dependencies": { - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "aws-sdk": "^2.49.0", "mime": "^1.3.4", "electron-publish": "~0.0.0-semantic-release", diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json index f3a316bf0a7..ca9f62f951e 100644 --- a/packages/electron-updater/package.json +++ b/packages/electron-updater/package.json @@ -13,7 +13,7 @@ ], "dependencies": { "bluebird-lst": "^1.0.2", - "fs-extra-p": "^4.1.0", + "fs-extra-p": "^4.3.0", "js-yaml": "^3.8.3", "semver": "^5.3.0", "source-map-support": "^0.4.15", diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts index 1885e03f691..98fc7d446f3 100644 --- a/test/src/helpers/runTests.ts +++ b/test/src/helpers/runTests.ts @@ -1,7 +1,6 @@ import BluebirdPromise from "bluebird-lst" import { emptyDir, readdir, readJson, removeSync, unlink } from "fs-extra-p" import isCi from "is-ci" -import { homedir } from "os" import * as path from "path" import { ELECTRON_VERSION, TEST_DIR } from "./config" @@ -22,7 +21,7 @@ async function deleteOldElectronVersion(): Promise { return } - const cacheDir = path.join(homedir(), ".electron") + const cacheDir = require("env-paths")("electron", {suffix: ""}).cache try { const deletePromises: Array> = [] for (const file of (await readdir(cacheDir))) { diff --git a/yarn.lock b/yarn.lock index f156c0d8b9f..5ecef870e3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -301,7 +301,7 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.0.0, babel-core@^6.24.0, babel-core@^6.24.1: +babel-core@^6.0.0, babel-core@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83" dependencies: @@ -1070,13 +1070,13 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -electron-download-tf@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.2.1.tgz#d16d2e4c29fc681c10ce42235c629cd812533884" +electron-download-tf@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.3.1.tgz#7930f24a08e3669eaad38a5f7f288a10461caf72" dependencies: - debug "^2.6.3" + debug "^2.6.6" env-paths "^1.0.0" - fs-extra "^2.1.2" + fs-extra "^3.0.1" minimist "^1.2.0" nugget "^2.0.1" path-exists "^3.0.0" @@ -1313,19 +1313,20 @@ form-data@~2.1.1: combined-stream "^1.0.5" mime-types "^2.1.12" -fs-extra-p@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.1.0.tgz#7356871b0ebf5e13c80a1194477a4d587ac0d3fd" +fs-extra-p@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.3.0.tgz#2e148a544287df0258931cabc583063b4eed2303" dependencies: bluebird-lst "^1.0.2" - fs-extra "^2.1.2" + fs-extra "^3.0.1" -fs-extra@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35" +fs-extra@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" dependencies: graceful-fs "^4.1.2" - jsonfile "^2.1.0" + jsonfile "^3.0.0" + universalify "^0.1.0" fs-then-native@^2.0.0: version "2.0.0" @@ -2099,9 +2100,9 @@ json5@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" +jsonfile@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0" optionalDependencies: graceful-fs "^4.1.6" @@ -2988,7 +2989,7 @@ sort-array@^1.1.1: object-get "^2.1.0" typical "^2.6.0" -source-map-support@^0.4.14, source-map-support@^0.4.15, source-map-support@^0.4.2: +source-map-support@^0.4.15, source-map-support@^0.4.2: version "0.4.15" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1" dependencies: @@ -3281,25 +3282,25 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" -ts-babel@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-3.0.0.tgz#039e953fc3cda0d3f1f243137b8118ba0cf052c9" +ts-babel@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-3.0.1.tgz#c1b5ff4599987ddcdf37a2d79e603ffb6d7a0b6a" dependencies: - babel-core "^6.24.0" + babel-core "^6.24.1" bluebird-lst "^1.0.2" chalk "^1.1.3" - fs-extra-p "^4.1.0" - source-map-support "^0.4.14" + fs-extra-p "^4.3.0" + source-map-support "^0.4.15" -ts-jsdoc@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ts-jsdoc/-/ts-jsdoc-1.2.1.tgz#e2b05881c4f8cc4b0972586d01d7a91673d18745" +ts-jsdoc@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/ts-jsdoc/-/ts-jsdoc-1.2.2.tgz#3cf1e32045e45c758844d5aad2aeb85feef45f37" dependencies: bluebird-lst "^1.0.2" chalk "^1.1.3" doctrine "^2.0.0" - fs-extra-p "^4.1.0" - source-map-support "^0.4.14" + fs-extra-p "^4.3.0" + source-map-support "^0.4.15" tslib@^1.6.0: version "1.7.0" @@ -3393,6 +3394,10 @@ unique-string@^1.0.0: dependencies: crypto-random-string "^1.0.0" +universalify@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778" + unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"