Merge pull request #1389 from hovancik/up/deps

Update dependencies
hovancik · Nov 7, 2023 · bce954a · bce954a
2 parents 3c85cfc + 492953b
commit bce954a
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 91 deletions.
diff --git a/app/break.js b/app/break.js
@@ -4,9 +4,6 @@ const Utils = remote.require('./utils/utils')
 const HtmlTranslate = require('./utils/htmlTranslate')
 const Store = require('electron-store')
 const settings = new Store()
-const log = require('electron-log')
-const path = require('path')
-log.transports.file.resolvePath = () => path.join(remote.app.getPath('userData'), 'logs/main.log')
 
 window.onload = (event) => {
  ipcRenderer.send('send-break-data')

diff --git a/app/breaksPlanner.js b/app/breaksPlanner.js
@@ -3,7 +3,7 @@ const EventEmitter = require('events')
 const NaturalBreaksManager = require('./utils/naturalBreaksManager')
 const DndManager = require('./utils/dndManager')
 const AppExclusionsManager = require('./utils/appExclusionsManager')
-const log = require('electron-log')
+const log = require('electron-log/main')
 
 class BreaksPlanner extends EventEmitter {
  constructor (settings) {

diff --git a/app/main.js b/app/main.js
@@ -6,7 +6,7 @@ const {
 const path = require('path')
 const i18next = require('i18next')
 const Backend = require('i18next-fs-backend')
-const log = require('electron-log')
+const log = require('electron-log/main')
 const Store = require('electron-store')
 
 process.on('uncaughtException', (err, _) => {
@@ -61,6 +61,7 @@ let currentTrayMenuTemplate = null
 let trayUpdateIntervalObj = null
 
 require('@electron/remote/main').initialize()
+log.initialize({ preload: true })
 
 app.setAppUserModelId('net.hovancik.stretchly')
 

diff --git a/app/microbreak.js b/app/microbreak.js
@@ -4,9 +4,6 @@ const Utils = remote.require('./utils/utils')
 const HtmlTranslate = require('./utils/htmlTranslate')
 const Store = require('electron-store')
 const settings = new Store()
-const log = require('electron-log')
-const path = require('path')
-log.transports.file.resolvePath = () => path.join(remote.app.getPath('userData'), 'logs/main.log')
 
 window.onload = (e) => {
  ipcRenderer.send('send-microbreak-data')

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -22,16 +22,16 @@
  "dependencies": {
  "@electron/remote": "^2.0.12",
  "dbus-final": "github:Jelmerro/dbus-final",
- "electron-log": "^4.4.8",
+ "electron-log": "^5.0.0",
  "electron-store": "^8.1.0",
  "humanize-duration": "^3.30.0",
- "i18next": "^23.5.1",
+ "i18next": "^23.6.0",
  "i18next-fs-backend": "^2.2.0",
  "luxon": "^3.4.3",
  "macos-notification-state": "^3.0.0",
  "meeussunmoon": "^3.0.3",
  "ps-list": "7.2.0",
- "rtl-detect": "^1.0.4",
+ "rtl-detect": "^1.1.2",
  "semver": "^7.5.4",
  "windows-focus-assist": "^1.3.0",
  "windows-quiet-hours": "^2.0.0"

diff --git a/app/process.js b/app/process.js
@@ -4,13 +4,10 @@ const VersionChecker = require('./utils/versionChecker')
 const i18next = remote.require('i18next')
 const semver = require('semver')
 const { shouldShowNotificationTitle } = require('./utils/utils')
-const log = require('electron-log')
-const path = require('path')
-log.transports.file.resolvePath = () => path.join(remote.app.getPath('userData'), 'logs/main.log')
 
 window.onload = (e) => {
  ipcRenderer.on('playSound', (event, file, volume) => {
- log.info(`Stretchly: playing audio/${file}.wav (volume: ${volume})`)
+ __electronLog.info(`Stretchly: playing audio/${file}.wav (volume: ${volume})`)
  const audio = new Audio(`audio/${file}.wav`)
  audio.volume = volume
  audio.play()
@@ -25,7 +22,7 @@ window.onload = (e) => {
  .then(version => {
  if (version) {
  const cleanVersion = semver.clean(version)
- log.info(`Stretchly: checking for new version (local: ${oldVersion}, remote: ${cleanVersion})`)
+ __electronLog.info(`Stretchly: checking for new version (local: ${oldVersion}, remote: ${cleanVersion})`)
  if (semver.valid(cleanVersion) && semver.gt(cleanVersion, oldVersion)) {
  remote.getGlobal('shared').isNewVersion = true
  ipcRenderer.send('update-tray')
@@ -34,10 +31,10 @@ window.onload = (e) => {
  }
  }
  } else {
- log.info('Stretchly: could not check for new version')
+ __electronLog.info('Stretchly: could not check for new version')
  }
  })
- .catch(exception => log.error(exception))
+ .catch(exception => __electronLog.error(exception))
  }
  })
 

diff --git a/app/utils/appExclusionsManager.js b/app/utils/appExclusionsManager.js
@@ -1,5 +1,5 @@
 const EventEmitter = require('events')
-const log = require('electron-log')
+const log = require('electron-log/main')
 const psList = require('ps-list')
 
 class AppExclusionsManager extends EventEmitter {

diff --git a/app/utils/commands.js b/app/utils/commands.js
@@ -1,5 +1,5 @@
 const { UntilMorning } = require('./untilMorning')
-const log = require('electron-log')
+const log = require('electron-log/main')
 
 const allOptions = {
  title: {

diff --git a/app/utils/dndManager.js b/app/utils/dndManager.js
@@ -1,5 +1,5 @@
 const EventEmitter = require('events')
-const log = require('electron-log')
+const log = require('electron-log/main')
 
 class DndManager extends EventEmitter {
  constructor (settings) {

diff --git a/app/utils/naturalBreaksManager.js b/app/utils/naturalBreaksManager.js
@@ -1,5 +1,5 @@
 const EventEmitter = require('events')
-const log = require('electron-log')
+const log = require('electron-log/main')
 
 class NaturalBreaksManager extends EventEmitter {
  constructor (settings) {

diff --git a/app/utils/untilMorning.js b/app/utils/untilMorning.js
@@ -1,6 +1,6 @@
 const { DateTime } = require('luxon')
 const MeeusSunMoon = require('meeussunmoon')
-const log = require('electron-log')
+const log = require('electron-log/main')
 
 class UntilMorning {
  constructor (settings) {