Skip to content

Commit 46a7ca8

Browse files
yamalightyamalight
committed
Fix autoupdate builds for mac, correctly generate config, v0.3.0
1 parent 1a0ca54 commit 46a7ca8

File tree

5 files changed

+70
-62
lines changed

5 files changed

+70
-62
lines changed

‎index.html‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="UTF-8">
5-
<title>BPJS Electron</title>
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>BPJS Electron</title>
66

7-
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css">
8-
<link rel="stylesheet" href="node_modules/bulma/css/bulma.css">
9-
<link rel="stylesheet" href="node_modules/video.js/dist/video-js.min.css">
10-
<link rel="stylesheet" href="node_modules/libjass/libjass.css">
11-
<link rel="stylesheet" href="node_modules/videojs-ass/src/videojs.ass.css">
12-
</head>
13-
<body>
14-
<div id="app"></div>
15-
</body>
7+
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css">
8+
<link rel="stylesheet" href="node_modules/bulma/css/bulma.css">
9+
<link rel="stylesheet" href="node_modules/video.js/dist/video-js.min.css">
10+
<link rel="stylesheet" href="node_modules/libjass/libjass.css">
11+
<link rel="stylesheet" href="node_modules/videojs-ass/src/videojs.ass.css">
12+
</head>
13+
<body>
14+
<div id="app"></div>
15+
</body>
1616

17-
<script src="node_modules/video.js/dist/video.min.js"></script>
18-
<script src="node_modules/libjass/libjass.min.js"></script>
19-
<script src="node_modules/videojs-contrib-hls/dist/videojs-contrib-hls.min.js"></script>
20-
<script src="node_modules/videojs-ass/src/videojs.ass.js"></script>
21-
<script>
22-
console.log(process.env.NODE_ENV);
23-
if (process.env.NODE_ENV === 'test') {
24-
require('babel-register')({
25-
presets: [
26-
['env', {
27-
targets: {
28-
electron: 1.6
29-
},
30-
}],
31-
'react',
32-
],
33-
});
34-
require('./src/index.js');
35-
} else {
36-
require('./src/app.min.js');
37-
}
38-
</script>
17+
<script src="node_modules/video.js/dist/video.min.js"></script>
18+
<script src="node_modules/libjass/libjass.min.js"></script>
19+
<script src="node_modules/videojs-contrib-hls/dist/videojs-contrib-hls.min.js"></script>
20+
<script src="node_modules/videojs-ass/src/videojs.ass.js"></script>
21+
<script>
22+
// Listen for messages
23+
const { ipcRenderer } = require('electron');
24+
ipcRenderer.on('message', function (event, text) {
25+
console.log('Message from updater:', text);
26+
});
27+
28+
if (process.env.NODE_ENV === 'test') {
29+
require('babel-register')({
30+
presets: [
31+
['env', {
32+
targets: {
33+
electron: 1.6
34+
},
35+
}],
36+
'react',
37+
],
38+
});
39+
require('./src/index.js');
40+
} else {
41+
require('./src/app.min.js');
42+
}
43+
</script>
3944
</html>

‎index.js‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ const url = require('url');
33
const path = require('path');
44
const electron = require('electron');
55
const {autoUpdater} = require('electron-updater');
6+
const log = require('electron-log');
7+
8+
// configure logging
9+
autoUpdater.logger = log;
10+
autoUpdater.logger.transports.file.level = 'info';
11+
log.info('App starting...');
612

713
// Module to control application life.
814
const app = electron.app;
@@ -14,9 +20,6 @@ const BrowserWindow = electron.BrowserWindow;
1420
let mainWindow;
1521

1622
function createWindow() {
17-
// trigger autoupdate check
18-
autoUpdater.checkForUpdates();
19-
2023
// Create the browser window.
2124
mainWindow = new BrowserWindow({
2225
width: 800,
@@ -33,7 +36,7 @@ function createWindow() {
3336
);
3437

3538
// Open the DevTools.
36-
// mainWindow.webContents.openDevTools();
39+
mainWindow.webContents.openDevTools();
3740

3841
// Emitted when the window is closed.
3942
mainWindow.on('closed', function() {
@@ -42,6 +45,9 @@ function createWindow() {
4245
// when you should delete the corresponding element.
4346
mainWindow = null;
4447
});
48+
49+
// trigger autoupdate check
50+
autoUpdater.checkForUpdates();
4551
}
4652

4753
// This method will be called when Electron has finished
@@ -69,25 +75,32 @@ app.on('activate', function() {
6975
//-------------------------------------------------------------------
7076
// Auto updates
7177
//-------------------------------------------------------------------
78+
const sendStatusToWindow = (text) => {
79+
log.info(text);
80+
if (mainWindow) {
81+
mainWindow.webContents.send('message', text);
82+
}
83+
};
84+
7285
autoUpdater.on('checking-for-update', () => {
73-
console.log('Checking for update...');
86+
sendStatusToWindow('Checking for update...');
7487
});
7588
autoUpdater.on('update-available', info => {
76-
console.log('Update available.');
89+
sendStatusToWindow('Update available.');
7790
});
7891
autoUpdater.on('update-not-available', info => {
79-
console.log('Update not available.');
92+
sendStatusToWindow('Update not available.');
8093
});
8194
autoUpdater.on('error', err => {
82-
console.log('Error in auto-updater.');
95+
sendStatusToWindow(`Error in auto-updater: ${err.toString()}`);
8396
});
8497
autoUpdater.on('download-progress', progressObj => {
85-
console.log(
98+
sendStatusToWindow(
8699
`Download speed: ${progressObj.bytesPerSecond} - Downloaded ${progressObj.percent}% (${progressObj.transferred} + '/' + ${progressObj.total} + )`
87100
);
88101
});
89102
autoUpdater.on('update-downloaded', info => {
90-
console.log('Update downloaded; will install now');
103+
sendStatusToWindow('Update downloaded; will install now');
91104
});
92105

93106
autoUpdater.on('update-downloaded', info => {

‎package.json‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
11
{
22
"name": "bpjs-electron",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"description": "BPJS Electron app",
55
"main": "index.js",
66
"repository": "git@github.com:yamalight/bpjs-electron.git",
77
"author": "Tim Ermilov <yamalight@gmail.com>",
88
"license": "MIT",
9-
"build": {
10-
"appId": "com.bpjs.ElectronDemo",
11-
"mac": {
12-
"category": "com.bpjs.demo",
13-
"target": [
14-
"dmg"
15-
]
16-
}
17-
},
189
"scripts": {
1910
"start": "NODE_ENV=test electron .",
2011
"production": "electron .",
2112
"lint": "eslint **/*.js",
2213
"inspect-main": "electron-inspector",
2314
"build": "rollup -c",
2415
"pack": "electron-builder --dir",
25-
"dist": "electron-builder --x64",
26-
"gh-publish": "electron-builder --x64 -p always",
16+
"dist": "electron-builder --x64 --mac",
17+
"gh-publish": "electron-builder --x64 --mac -p always",
2718
"test": "NODE_ENV=test mocha"
2819
},
2920
"devDependencies": {
@@ -53,6 +44,7 @@
5344
"big-integer": "^1.6.22",
5445
"bulma": "^0.4.0",
5546
"cheerio": "^0.22.0",
47+
"electron-log": "^2.2.7",
5648
"electron-updater": "^2.8.7",
5749
"font-awesome": "^4.7.0",
5850
"lodash": "^4.17.4",

‎src/pages/settings.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ export default class Settings extends React.Component {
3232
</Link>
3333
</div>
3434
</div>
35-
36-
<div className="nav-right nav-menu">
37-
<div className="nav-item">
38-
I was updated
39-
</div>
40-
</div>
4135
</nav>
4236

4337
<div className="content columns">

‎yarn.lock‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,10 @@ electron-is-dev@^0.3.0:
16221622
version "0.3.0"
16231623
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
16241624

1625+
electron-log@^2.2.7:
1626+
version "2.2.7"
1627+
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.7.tgz#8da0d2586b53b175392ae6b91dc510a67c195341"
1628+
16251629
electron-osx-sign@0.4.7:
16261630
version "0.4.7"
16271631
resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.7.tgz#1d75647a82748eacd48bea70616ec83ffade3ee5"

0 commit comments

Comments
 (0)