diff --git a/.travis.yml b/.travis.yml index a68d2c9..2028541 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ osx_image: xcode8.3 dist: trusty sudo: false -language: c +language: node_js +node_js: "8" env: - ELECTRON_CACHE=$HOME/.electron @@ -18,8 +19,8 @@ matrix: cache: directories: - node_modules - - $HOME/.electron - - $HOME/.cache + - $HOME/Library/Caches/electron + - $HOME/Library/Caches/electron-builder addons: apt: @@ -29,17 +30,14 @@ addons: - icnsutils before_install: - - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.5.5/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.5.5.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull - - curl -o- -L https://yarnpkg.com/install.sh | bash - - export PATH="$HOME/.yarn/bin:$PATH" + - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.1.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.1.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull install: -- nvm install 7 -- yarn install +- yarn - yarn add electron-builder@next --dev # force install next version to test electron-builder script: -- yarn run release +- yarn release branches: except: diff --git a/package.json b/package.json index 42e45ce..3ae5ecd 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,10 @@ }, "dependencies": { "configstore": "^3.1.0", - "electron-debug": "^1.1.0", + "electron-debug": "^1.2.0", "electron-is-dev": "^0.1.2", "electron-log": "^2.2.6", - "electron-updater": "^2.3.1", + "electron-updater": "^2.4.2", "keytar": "^4.0.3" }, "devDependencies": { @@ -55,6 +55,6 @@ "electron": "1.7.3", "electron-builder": "next", "rimraf": "^2.6.1", - "typescript": "^2.4.0" + "typescript": "^2.3.4" } } diff --git a/yarn.lock b/yarn.lock index f793d11..0ced978 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,8 +27,8 @@ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.29.tgz#a1e514adfbd92f03a224ba54d693111dbf1f3754" "@types/node@^7.0.18": - version "7.0.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.31.tgz#80ea4d175599b2a00149c29a10a4eb2dff592e86" + version "7.0.32" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba" ajv-keywords@^2.1.0: version "2.1.0" @@ -312,7 +312,7 @@ debug@2.2.0: dependencies: ms "0.7.1" -debug@2.6.8, debug@^2.1.3, debug@^2.2.0, debug@^2.6.1, debug@^2.6.6, debug@^2.6.8: +debug@^2.1.3, debug@^2.2.0, debug@^2.6.1, debug@^2.6.6, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -346,22 +346,22 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -electron-builder-http@19.5.1, electron-builder-http@~19.5.1: - version "19.5.1" - resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.5.1.tgz#2afcd65ef97fbde3812eb68a65371b4ef278ac58" +electron-builder-http@19.7.2, electron-builder-http@~19.7.2: + version "19.7.2" + resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.7.2.tgz#5a63566e4a4685413861eaf087dcaa9a0e362a03" dependencies: - debug "2.6.8" + debug "^2.6.8" fs-extra-p "^4.3.0" -electron-builder-util@19.5.1, electron-builder-util@~19.5.1: - version "19.5.1" - resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-19.5.1.tgz#4d63c207c64ae007d1e775a2f190ce4d1026ec70" +electron-builder-util@19.7.2, electron-builder-util@~19.7.2: + version "19.7.2" + resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-19.7.2.tgz#d33454ead9f6f782ebc4aa7503fa33034a940f22" dependencies: "7zip-bin" "^2.1.0" bluebird-lst "^1.0.2" chalk "^1.1.3" - debug "2.6.8" - electron-builder-http "~19.5.1" + debug "^2.6.8" + electron-builder-http "~19.7.2" fcopy-pre-bundled "0.3.4" fs-extra-p "^4.3.0" ini "^1.3.4" @@ -372,8 +372,8 @@ electron-builder-util@19.5.1, electron-builder-util@~19.5.1: tunnel-agent "^0.6.0" electron-builder@next: - version "19.5.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.5.1.tgz#20b0d0560c9a994bd42b78d3264b5ad45631ab17" + version "19.7.3" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.7.3.tgz#37040a3a4a3e6fe8fff041a65210a7692817a53d" dependencies: "7zip-bin" "^2.1.0" ajv "^5.2.0" @@ -383,12 +383,12 @@ electron-builder@next: chalk "^1.1.3" chromium-pickle-js "^0.2.0" cuint "^0.2.2" - debug "2.6.8" - electron-builder-http "19.5.1" - electron-builder-util "19.5.1" + debug "^2.6.8" + electron-builder-http "19.7.2" + electron-builder-util "19.7.2" electron-download-tf "4.3.1" electron-osx-sign "0.4.6" - electron-publish "19.5.1" + electron-publish "19.7.2" fs-extra-p "^4.3.0" hosted-git-info "^2.4.2" is-ci "^1.0.10" @@ -396,7 +396,6 @@ electron-builder@next: js-yaml "^3.8.4" json5 "^0.5.1" minimatch "^3.0.4" - node-forge "^0.7.1" normalize-package-data "^2.3.8" parse-color "^1.0.0" plist "^2.1.0" @@ -406,12 +405,12 @@ electron-builder@next: uuid-1345 "^0.99.6" yargs "^8.0.2" -electron-debug@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.1.0.tgz#050a9c3f906fffc2492510cf8ac31d0f32a579e1" +electron-debug@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222" dependencies: electron-is-dev "^0.1.0" - electron-localshortcut "^0.6.0" + electron-localshortcut "^2.0.0" electron-download-tf@4.3.1: version "4.3.1" @@ -441,13 +440,19 @@ electron-download@^3.0.1: semver "^5.3.0" sumchecker "^1.2.0" +electron-is-accelerator@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" + electron-is-dev@^0.1.0, electron-is-dev@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3" -electron-localshortcut@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-0.6.1.tgz#c4e268c38a6e42f40de5618fc906d1ed608f11aa" +electron-localshortcut@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.0.tgz#bf088d42812d764c06ae0c9f179cf204d9c90103" + dependencies: + electron-is-accelerator "^0.1.0" electron-log@^2.2.6: version "2.2.6" @@ -465,24 +470,24 @@ electron-osx-sign@0.4.6: plist "^2.0.1" tempfile "^1.1.1" -electron-publish@19.5.1: - version "19.5.1" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.5.1.tgz#4300b9e80233b06c1eaa62d90a78e1030a4405f7" +electron-publish@19.7.2: + version "19.7.2" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.7.2.tgz#8fd8f1a6d895e2e0d4b654d2d78d1bd1b768e613" dependencies: bluebird-lst "^1.0.2" chalk "^1.1.3" - electron-builder-http "~19.5.1" - electron-builder-util "~19.5.1" + electron-builder-http "~19.7.2" + electron-builder-util "~19.7.2" fs-extra-p "^4.3.0" mime "^1.3.6" -electron-updater@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.3.1.tgz#e3d4ae259421287f13fb7739b02da4ab004d599c" +electron-updater@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.4.2.tgz#47cc25b2ff880d6115a9f7df385983199e45c11b" dependencies: bluebird-lst "^1.0.2" debug "^2.6.8" - electron-builder-http "~19.5.1" + electron-builder-http "~19.7.2" electron-is-dev "^0.1.2" fs-extra-p "^4.3.0" js-yaml "^3.8.4" @@ -752,7 +757,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.1: +inherits@2, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -1061,10 +1066,6 @@ node-emoji@^1.5.1: dependencies: string.prototype.codepointat "^0.2.0" -node-forge@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb" @@ -1307,14 +1308,14 @@ read-pkg@^2.0.0: path-type "^2.0.0" readable-stream@^2.2.2: - version "2.2.11" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72" + version "2.3.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d" dependencies: core-util-is "~1.0.0" - inherits "~2.0.1" + inherits "~2.0.3" isarray "~1.0.0" process-nextick-args "~1.0.6" - safe-buffer "~5.0.1" + safe-buffer "~5.1.0" string_decoder "~1.0.0" util-deprecate "~1.0.1" @@ -1394,9 +1395,9 @@ rimraf@^2.2.8, rimraf@^2.6.1: dependencies: glob "^7.0.5" -safe-buffer@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223" +safe-buffer@^5.0.1, safe-buffer@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" safe-buffer@~5.0.1: version "5.0.1" @@ -1409,8 +1410,8 @@ sanitize-filename@^1.6.1: truncate-utf8-bytes "^1.0.0" sax@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828" + version "1.2.3" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.3.tgz#a6134f5f11259b9a563f2f976bcf759d144803e3" semver-diff@^2.0.0: version "2.1.0" @@ -1634,7 +1635,7 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.4.0: +typescript@^2.3.4: version "2.4.0" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.0.tgz#aef5a8d404beba36ad339abf079ddddfffba86dd"