diff --git a/package.json b/package.json index 4fdea22..4533fe6 100644 --- a/package.json +++ b/package.json @@ -43,10 +43,10 @@ }, "dependencies": { "configstore": "^2.1.0", - "electron-auto-updater": "next", "electron-debug": "^1.1.0", "electron-is-dev": "^0.1.2", "electron-log": "^1.3.0", + "electron-updater": "1.1.1", "keytar": "^3.0.2", "nslog": "^3.0.0" }, diff --git a/src/AppUpdater.ts b/src/AppUpdater.ts index 1b1c5df..f14b0eb 100644 --- a/src/AppUpdater.ts +++ b/src/AppUpdater.ts @@ -1,7 +1,7 @@ import {BrowserWindow as BrowserWindowElectron} from "electron"; import * as os from "os"; import {isDev} from "./util"; -import {autoUpdater} from "electron-auto-updater"; +import {autoUpdater} from "electron-updater"; import BrowserWindow = Electron.BrowserWindow export default class AppUpdater { diff --git a/tsconfig.json b/tsconfig.json index 0477860..cc3b80d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ }, "include": [ "node_modules/@types/*/*.d.ts", - "node_modules/electron-auto-updater/out/*.d.ts", + "node_modules/electron-updater/out/*.d.ts", "node_modules/electron-builder-http/out/*.d.ts", "node_modules/bluebird-lst-c/index.d.ts", "src/*.ts", diff --git a/yarn.lock b/yarn.lock index ba6725d..f3b6386 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,8 +33,8 @@ "@types/node" "*" "@types/node@*": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.0.tgz#c081147b109da5f9c57af70571771be97ce9c0ba" + version "7.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.1.tgz#858610f58e4d48dd4410145eef9e12c97e3aacfd" ansi-align@^1.1.0: version "1.1.0" @@ -108,13 +108,13 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bluebird-lst-c@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/bluebird-lst-c/-/bluebird-lst-c-1.0.5.tgz#50da657dcde337a0e29d9e080ba714c5a52016e2" +bluebird-lst-c@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/bluebird-lst-c/-/bluebird-lst-c-1.0.6.tgz#81f881d13f9df700f67d577f13480bc32d84bba9" dependencies: - bluebird "^3.4.6" + bluebird "^3.4.7" -bluebird@^3.4.6, bluebird@^3.4.7: +bluebird@^3.4.7: version "3.4.7" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" @@ -288,7 +288,7 @@ debug@0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" -debug@2.6.0, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.5.2: +debug@2.6.0, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" dependencies: @@ -324,59 +324,48 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -electron-auto-updater@next: - version "1.0.0" - resolved "https://registry.yarnpkg.com/electron-auto-updater/-/electron-auto-updater-1.0.0.tgz#fcaac7cb48afa9c3ea1d48b0ff7f0eee1a51418e" - dependencies: - bluebird-lst-c "^1.0.5" - electron-builder-http "11.3.0" - fs-extra-p "^3.0.3" - js-yaml "^3.7.0" - semver "^5.3.0" - source-map-support "^0.4.8" - electron-builder-core@11.2.1: version "11.2.1" resolved "https://registry.yarnpkg.com/electron-builder-core/-/electron-builder-core-11.2.1.tgz#1dca8c1a1cee8b51750b7708a04913aeffacf8a8" -electron-builder-http@11.3.0, electron-builder-http@~11.3.0: - version "11.3.0" - resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-11.3.0.tgz#9ac35fa08da30cff3c42dc3a2444958796afd117" +electron-builder-http@11.5.0, electron-builder-http@~11.5.0: + version "11.5.0" + resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-11.5.0.tgz#b77396634903444329eda3bbcd02321440e06038" dependencies: debug "2.6.0" - fs-extra-p "^3.0.3" + fs-extra-p "^3.1.0" -electron-builder-util@11.4.0: - version "11.4.0" - resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-11.4.0.tgz#3f9937fd6b1f79d2e418e78d7ed74ff769b00d93" +electron-builder-util@11.5.0: + version "11.5.0" + resolved "https://registry.yarnpkg.com/electron-builder-util/-/electron-builder-util-11.5.0.tgz#90b9b9be9e7bc88b6002dfc1cc8635003119ddad" dependencies: "7zip-bin" "^2.0.4" - bluebird-lst-c "^1.0.5" + bluebird-lst-c "^1.0.6" chalk "^1.1.3" debug "2.6.0" - electron-builder-http "~11.3.0" - fs-extra-p "^3.0.3" + electron-builder-http "~11.5.0" + fs-extra-p "^3.1.0" is-ci "^1.0.10" node-emoji "^1.5.1" - source-map-support "^0.4.9" + source-map-support "^0.4.10" stat-mode "^0.2.2" electron-builder@next: - version "11.4.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-11.4.3.tgz#6ea02a5d3bbd1a3a1fc6c96fba6c672e1eab4bf2" + version "11.5.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-11.5.1.tgz#91754c47658ab1cd32483c6cf74cbf36bf931ec6" dependencies: "7zip-bin" "^2.0.4" asar-electron-builder "^0.13.5" - bluebird-lst-c "^1.0.5" + bluebird-lst-c "^1.0.6" chalk "^1.1.3" chromium-pickle-js "^0.2.0" cuint "^0.2.2" electron-builder-core "11.2.1" - electron-builder-http "11.3.0" - electron-builder-util "11.4.0" + electron-builder-http "11.5.0" + electron-builder-util "11.5.0" electron-download-tf "3.1.0" - electron-macos-sign "~1.4.0" - fs-extra-p "^3.0.3" + electron-macos-sign "~1.5.0" + fs-extra-p "^3.1.0" hosted-git-info "^2.1.5" ini "^1.3.4" is-ci "^1.0.10" @@ -441,20 +430,30 @@ electron-log@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-1.3.0.tgz#d05544114b971a16c86739c79d0d236103ad0a16" -electron-macos-sign@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/electron-macos-sign/-/electron-macos-sign-1.4.0.tgz#9065ffcfc77db9cc41a521b97081d5193e371c84" +electron-macos-sign@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/electron-macos-sign/-/electron-macos-sign-1.5.0.tgz#fe3a8acb755b5f568f1fe144e9e66cee44019448" dependencies: bluebird "^3.4.7" compare-version "^0.1.2" - debug "^2.5.2" - isbinaryfile "^3.0.1" - minimist "^1.2.0" + debug "^2.6.0" + isbinaryfile "^3.0.2" plist "^2.0.1" -electron@1.4.14: - version "1.4.14" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.14.tgz#e374b76ccdc432bccad9bb3ce1add453bf5648b4" +electron-updater@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-1.1.1.tgz#39e602b60fccb51b5d48a480bcae25f2987bf5c8" + dependencies: + bluebird-lst-c "^1.0.6" + electron-builder-http "11.5.0" + fs-extra-p "^3.1.0" + js-yaml "^3.7.0" + semver "^5.3.0" + source-map-support "^0.4.10" + +electron@1.4.15: + version "1.4.15" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.15.tgz#eaccafe3f55ade02a746b706ac14b43db6c7ccf8" dependencies: electron-download "^3.0.1" extract-zip "^1.0.3" @@ -523,12 +522,12 @@ form-data@~2.1.1: combined-stream "^1.0.5" mime-types "^2.1.12" -fs-extra-p@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-3.0.3.tgz#2e48b1e6c196feb75ac6f0c6419760ce8b847f33" +fs-extra-p@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-3.1.0.tgz#eddf7bb8d9385d79014decb21f45b1d0c57900d3" dependencies: - bluebird-lst-c "^1.0.5" - fs-extra "^1.0.0" + bluebird-lst-c "^1.0.6" + fs-extra "^2.0.0" fs-extra@^0.30.0: version "0.30.0" @@ -548,6 +547,13 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" +fs-extra@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^2.1.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -765,7 +771,7 @@ isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -isbinaryfile@^3.0.1, isbinaryfile@^3.0.2: +isbinaryfile@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" @@ -1278,9 +1284,9 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -source-map-support@^0.4.8, source-map-support@^0.4.9: - version "0.4.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.9.tgz#45eaa04f067e049d987b27599ed014a37750aaff" +source-map-support@^0.4.10: + version "0.4.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.10.tgz#d7b19038040a14c0837a18e630a196453952b378" dependencies: source-map "^0.5.3"