Browse Source

compat fixes

Eugene Pankov 6 years ago
parent
commit
a8bbdea224
4 changed files with 10 additions and 8 deletions
  1. 5 1
      app/lib/index.ts
  2. 1 1
      app/src/entry.preload.ts
  3. 1 1
      app/webpack.config.js
  4. 3 5
      terminus-core/src/services/log.service.ts

+ 5 - 1
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', () => {

+ 1 - 1
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'

+ 1 - 1
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'),
   },

+ 3 - 5
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