From a8bbdea2247ccac0923f0a49b97aba9a764c5096 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Fri, 24 May 2019 21:19:08 +0200
Subject: [PATCH] compat fixes

---
 app/lib/index.ts                          | 6 +++++-
 app/src/entry.preload.ts                  | 2 +-
 app/webpack.config.js                     | 2 +-
 terminus-core/src/services/log.service.ts | 8 +++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/lib/index.ts b/app/lib/index.ts
index 12294beb..d479f630 100644
--- a/app/lib/index.ts
+++ b/app/lib/index.ts
@@ -43,7 +43,11 @@ if (!app.requestSingleInstanceLock()) {
 }
 
 if (argv.d) {
-    electronDebug({ isEnabled: true, showDevTools: 'undocked' })
+    electronDebug({
+        isEnabled: true,
+        showDevTools: true,
+        devToolsMode: 'undocked'
+    })
 }
 
 app.on('ready', () => {
diff --git a/app/src/entry.preload.ts b/app/src/entry.preload.ts
index ec47a4e3..d280c130 100644
--- a/app/src/entry.preload.ts
+++ b/app/src/entry.preload.ts
@@ -1,5 +1,5 @@
 import '../lib/lru'
-import 'source-sans-pro'
+import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'
 import '@fortawesome/fontawesome-free/css/solid.css'
 import '@fortawesome/fontawesome-free/css/brands.css'
diff --git a/app/webpack.config.js b/app/webpack.config.js
index ff469906..ead80a99 100644
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -5,7 +5,7 @@ module.exports = {
   name: 'terminus',
   target: 'node',
   entry: {
-    'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
diff --git a/terminus-core/src/services/log.service.ts b/terminus-core/src/services/log.service.ts
index 5eb19339..2facbfe2 100644
--- a/terminus-core/src/services/log.service.ts
+++ b/terminus-core/src/services/log.service.ts
@@ -11,22 +11,20 @@ const initializeWinston = (electron: ElectronService) => {
         fs.mkdirSync(logDirectory)
     }
 
-    return new winston.Logger({
+    return winston.createLogger({
         transports: [
             new winston.transports.File({
                 level: 'debug',
                 filename: path.join(logDirectory, 'log.txt'),
+                format: winston.format.simple(),
                 handleExceptions: false,
-                json: false,
                 maxsize: 5242880,
                 maxFiles: 5,
-                colorize: false
             }),
             new winston.transports.Console({
                 level: 'debug',
                 handleExceptions: false,
-                json: false,
-                colorize: true
+                format: winston.format.colorize(),
             })
         ],
         exitOnError: false