Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "merge-request-notifier",
"version": "1.8.2",
"version": "1.8.3",
"description": "This app shows your merge requests grouped by projects and WIP status. It is accessible from the system tray.",
"main": "./dist/main/main.js",
"homepage": "https://github.com/codecentric/merge-request-notifier",
Expand Down
9 changes: 6 additions & 3 deletions src/main/autoUpdates.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { ipcMain } from 'electron'
import { ipcMain, app } from 'electron'
import { autoUpdater } from 'electron-updater'
import * as log from 'electron-log'
import * as path from 'path'

export const setupAutoUpdater = () => {
autoUpdater.autoDownload = false

if (process.env.NODE_ENV !== 'production') {
if (!app.isPackaged) {
// __dirname is the "dist" folder
autoUpdater.updateConfigPath = path.join(__dirname, '../dev-app-update.yml')
const updateConfigPath = path.join(__dirname, '../dev-app-update.yml')

log.info(`Updating the auto updater config path to "${updateConfigPath}".`)
autoUpdater.updateConfigPath = updateConfigPath
}

ipcMain.on('download-and-install-update', () => {
Expand Down
5 changes: 1 addition & 4 deletions webpack.renderer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ module.exports = merge.smart(baseConfig, {
tsconfig: 'tsconfig-renderer.json'
}),
new webpack.NamedModulesPlugin(),
new HtmlWebpackPlugin(),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
})
new HtmlWebpackPlugin()
]
});