Skip to content

Commit e0301b3

Browse files
alexparetoalexpareto
authored
use s3 for updates instead of github (#176)
* use s3 for updates instead of github * only use logger for dev * ignore yarn-error.log * remove yarn error from git
1 parent 391022f commit e0301b3

File tree

4 files changed

+86
-47
lines changed

4 files changed

+86
-47
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ renderer/out/
77
dist/
88

99
.DS_Store
10+
yarn-error.log

‎main/main.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const app = electron.app;
88
const Menu = electron.Menu;
99

1010
// auto update modules
11-
const autoUpdater = electron.autoUpdater;
11+
const autoUpdater = require('electron-updater').autoUpdater;
1212
const dialog = electron.dialog;
1313

1414
// Module to create native browser window.
@@ -92,6 +92,15 @@ autoUpdater.on('error', message => {
9292
console.error(message);
9393
});
9494

95+
autoUpdater.on('update-available', message => {
96+
console.log('An update is available!');
97+
});
98+
99+
if (isDev) {
100+
autoUpdater.logger = require('electron-log');
101+
autoUpdater.logger.transports.file.level = 'info';
102+
}
103+
95104
const setUpMenu = () => {
96105
if (isDev) {
97106
// don't set up menu on dev so we can use dev features
@@ -166,9 +175,6 @@ app.on('activate', function() {
166175
// check for updates on start
167176
function listenForUpdates() {
168177
if (!isDev) {
169-
const server = 'https://desktop-update.splish.io';
170-
const feed = `${server}/update/${process.platform}/${app.getVersion()}`;
171-
autoUpdater.setFeedURL(feed);
172178
setInterval(() => {
173179
autoUpdater.checkForUpdates();
174180
}, 60000);

‎package.json‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Splish",
3-
"version": "1.0.2",
3+
"version": "1.0.5",
44
"description": "Desktop Micro-Video Editor",
55
"main": "main/main.js",
66
"scripts": {
@@ -22,8 +22,8 @@
2222
"devDependencies": {
2323
"babel-eslint": "^8.2.1",
2424
"electron": "~1.7.8",
25-
"electron-builder": "^19.54.0",
26-
"electron-publisher-s3": "^19.54.0",
25+
"electron-builder": "^20",
26+
"electron-publisher-s3": "^20.0.0",
2727
"electron-rebuild": "^1.7.3",
2828
"eslint": "^4.15.0",
2929
"eslint-config-fbjs": "^2.0.1",
@@ -44,7 +44,9 @@
4444
"app-root-path": "^2.0.1",
4545
"d3": "^4.12.2",
4646
"electron-is-dev": "^0.3.0",
47+
"electron-log": "^2.2.14",
4748
"electron-next": "^3.1.3",
49+
"electron-updater": "^2.20.1",
4850
"es6-promise": "^4.2.1",
4951
"ffmpeg-static": "^2.1.0",
5052
"ffprobe-static": "^2.0.0",
@@ -78,10 +80,16 @@
7880
"build/icon.*",
7981
"!renderer/out/static/temp/"
8082
],
81-
"publish": {
82-
"provider": "github",
83-
"repo": "splish-desktop",
84-
"owner": "barooapp"
85-
}
83+
"publish": [
84+
{
85+
"provider": "s3",
86+
"bucket": "splish-desktop-releases"
87+
},
88+
{
89+
"provider": "github",
90+
"repo": "splish-desktop",
91+
"owner": "barooapp"
92+
}
93+
]
8694
}
8795
}

‎yarn.lock‎

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,22 +1215,22 @@ buffer@4.9.1, buffer@^4.3.0:
12151215
ieee754 "^1.1.4"
12161216
isarray "^1.0.0"
12171217

1218-
builder-util-runtime@4.0.4, builder-util-runtime@^4.0.4:
1219-
version "4.0.4"
1220-
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.4.tgz#c92c352097006a07f3324ea200fa815440cba198"
1218+
builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5, builder-util-runtime@~4.0.3:
1219+
version "4.0.5"
1220+
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
12211221
dependencies:
12221222
bluebird-lst "^1.0.5"
12231223
debug "^3.1.0"
12241224
fs-extra-p "^4.5.0"
12251225
sax "^1.2.4"
12261226

1227-
builder-util@4.2.4, builder-util@^4.2.2:
1228-
version "4.2.4"
1229-
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.4.tgz#ab0b460e6d62d8f24ecfe9435d9335851be3ea1a"
1227+
builder-util@4.2.5, builder-util@^4.2.5:
1228+
version "4.2.5"
1229+
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.5.tgz#babc190e2f2c3681497632b5cc274f1543aa9264"
12301230
dependencies:
12311231
"7zip-bin" "~3.0.0"
12321232
bluebird-lst "^1.0.5"
1233-
builder-util-runtime "^4.0.4"
1233+
builder-util-runtime "^4.0.5"
12341234
chalk "^2.3.0"
12351235
debug "^3.1.0"
12361236
fs-extra-p "^4.5.0"
@@ -2135,16 +2135,18 @@ diffie-hellman@^5.0.0:
21352135
miller-rabin "^4.0.0"
21362136
randombytes "^2.0.0"
21372137

2138-
dmg-builder@3.1.4:
2139-
version "3.1.4"
2140-
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-3.1.4.tgz#57c53a2b5a1e28526a837430b6ecc7110cadcf63"
2138+
dmg-builder@4.0.0:
2139+
version "4.0.0"
2140+
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.0.0.tgz#ee9464ead71ae983bea5fc167419a58120dfb7ad"
21412141
dependencies:
21422142
bluebird-lst "^1.0.5"
2143-
builder-util "^4.2.2"
2143+
builder-util "^4.2.5"
2144+
electron-builder-lib "~20.0.0"
21442145
fs-extra-p "^4.5.0"
21452146
iconv-lite "^0.4.19"
21462147
js-yaml "^3.10.0"
21472148
parse-color "^1.0.0"
2149+
sanitize-filename "^1.6.1"
21482150

21492151
doctrine@^2.0.2, doctrine@^2.1.0:
21502152
version "2.1.0"
@@ -2202,22 +2204,21 @@ ejs@^2.5.7:
22022204
version "2.5.7"
22032205
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
22042206

2205-
electron-builder-lib@19.56.2:
2206-
version "19.56.2"
2207-
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-19.56.2.tgz#9e4ef3a1a5fa21d3fd490561261ae639bb263da3"
2207+
electron-builder-lib@20.0.0, electron-builder-lib@~20.0.0:
2208+
version "20.0.0"
2209+
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.0.tgz#0f37012d53de8953e7f7cdf6bea298447e663dd6"
22082210
dependencies:
22092211
"7zip-bin" "~3.0.0"
22102212
asar-integrity "0.2.4"
22112213
async-exit-hook "^2.0.1"
22122214
bluebird-lst "^1.0.5"
2213-
builder-util "4.2.4"
2214-
builder-util-runtime "4.0.4"
2215+
builder-util "4.2.5"
2216+
builder-util-runtime "4.0.5"
22152217
chromium-pickle-js "^0.2.0"
22162218
debug "^3.1.0"
2217-
dmg-builder "3.1.4"
22182219
ejs "^2.5.7"
22192220
electron-osx-sign "0.4.8"
2220-
electron-publish "19.56.0"
2221+
electron-publish "20.0.0"
22212222
fs-extra-p "^4.5.0"
22222223
hosted-git-info "^2.5.0"
22232224
is-ci "^1.1.0"
@@ -2232,15 +2233,16 @@ electron-builder-lib@19.56.2:
22322233
semver "^5.5.0"
22332234
temp-file "^3.1.1"
22342235

2235-
electron-builder@^19.54.0:
2236-
version "19.56.2"
2237-
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.56.2.tgz#11c0c4544c4d82f1f1a2837e7f349a67457f1d99"
2236+
electron-builder@^20:
2237+
version "20.0.0"
2238+
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.0.0.tgz#e57f50bb20e2ac34dee4c7bfbd010a00d6fd3d95"
22382239
dependencies:
22392240
bluebird-lst "^1.0.5"
2240-
builder-util "4.2.4"
2241-
builder-util-runtime "4.0.4"
2241+
builder-util "4.2.5"
2242+
builder-util-runtime "4.0.5"
22422243
chalk "^2.3.0"
2243-
electron-builder-lib "19.56.2"
2244+
dmg-builder "4.0.0"
2245+
electron-builder-lib "20.0.0"
22442246
electron-download-tf "4.3.4"
22452247
fs-extra-p "^4.5.0"
22462248
is-ci "^1.1.0"
@@ -2282,6 +2284,10 @@ electron-is-dev@>=0.3.0, electron-is-dev@^0.3.0:
22822284
version "0.3.0"
22832285
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
22842286

2287+
electron-log@^2.2.14:
2288+
version "2.2.14"
2289+
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.14.tgz#2123319ccb8d70b0db07f0eda57d5823cb42b4b0"
2290+
22852291
electron-next@^3.1.3:
22862292
version "3.1.3"
22872293
resolved "https://registry.yarnpkg.com/electron-next/-/electron-next-3.1.3.tgz#3c489d96f17eea799bbb0eb22a419c987639a19b"
@@ -2300,25 +2306,25 @@ electron-osx-sign@0.4.8:
23002306
minimist "^1.2.0"
23012307
plist "^2.1.0"
23022308

2303-
electron-publish@19.56.0, electron-publish@~19.56.0:
2304-
version "19.56.0"
2305-
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.56.0.tgz#1a0446e69b3085a905c0abdf16125c1c97d108d9"
2309+
electron-publish@20.0.0, electron-publish@~20.0.0:
2310+
version "20.0.0"
2311+
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.0.tgz#57ab6ab27294c343a1c974014cb131b6f88fb82c"
23062312
dependencies:
23072313
bluebird-lst "^1.0.5"
2308-
builder-util "^4.2.2"
2309-
builder-util-runtime "^4.0.4"
2314+
builder-util "^4.2.5"
2315+
builder-util-runtime "^4.0.5"
23102316
chalk "^2.3.0"
23112317
fs-extra-p "^4.5.0"
23122318
mime "^2.2.0"
23132319

2314-
electron-publisher-s3@^19.54.0:
2315-
version "19.56.0"
2316-
resolved "https://registry.yarnpkg.com/electron-publisher-s3/-/electron-publisher-s3-19.56.0.tgz#9cbe5fae5629fcc29d662d34e80920d0a6d11160"
2320+
electron-publisher-s3@^20.0.0:
2321+
version "20.0.0"
2322+
resolved "https://registry.yarnpkg.com/electron-publisher-s3/-/electron-publisher-s3-20.0.0.tgz#e8962118d280b1118e45397d65a16ea644a2dc15"
23172323
dependencies:
23182324
aws-sdk "^2.188.0"
23192325
bluebird-lst "^1.0.5"
2320-
builder-util "^4.2.2"
2321-
electron-publish "~19.56.0"
2326+
builder-util "^4.2.5"
2327+
electron-publish "~20.0.0"
23222328
fs-extra-p "^4.5.0"
23232329
mime "^2.2.0"
23242330

@@ -2341,6 +2347,20 @@ electron-to-chromium@^1.3.30:
23412347
version "1.3.32"
23422348
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
23432349

2350+
electron-updater@^2.20.1:
2351+
version "2.20.1"
2352+
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.20.1.tgz#3d2714a3e472fbf198f6053daf8fd12209101aa2"
2353+
dependencies:
2354+
bluebird-lst "^1.0.5"
2355+
builder-util-runtime "~4.0.3"
2356+
electron-is-dev "^0.3.0"
2357+
fs-extra-p "^4.5.0"
2358+
js-yaml "^3.10.0"
2359+
lazy-val "^1.0.3"
2360+
lodash.isequal "^4.5.0"
2361+
semver "^5.5.0"
2362+
source-map-support "^0.5.2"
2363+
23442364
electron@~1.7.8:
23452365
version "1.7.12"
23462366
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e"
@@ -4197,6 +4217,10 @@ lodash.isarray@^3.0.0:
41974217
version "3.0.4"
41984218
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
41994219

4220+
lodash.isequal@^4.5.0:
4221+
version "4.5.0"
4222+
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
4223+
42004224
lodash.keys@^3.0.0, lodash.keys@^3.1.2:
42014225
version "3.1.2"
42024226
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -6023,7 +6047,7 @@ source-map-support@0.4.18, source-map-support@^0.4.15:
60236047
dependencies:
60246048
source-map "^0.5.6"
60256049

6026-
source-map-support@^0.5.3:
6050+
source-map-support@^0.5.2, source-map-support@^0.5.3:
60276051
version "0.5.3"
60286052
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
60296053
dependencies:

0 commit comments

Comments
 (0)