Merge branch 'master' of github.com:spotify/backstage into shmidt-i/backend-hmr-2

packages/backend-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.1.1-alpha.7",
+  "version": "0.1.1-alpha.8",
   "main": "dist",
   "types": "src/index.ts",
   "private": false,
@@ -37,7 +37,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.7",
+    "@backstage/cli": "^0.1.1-alpha.8",
     "@types/compression": "^1.7.0",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",

packages/backend-common/src/logging/rootLogger.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import winston from 'winston';
+import * as winston from 'winston';
 import { getRootLogger, setRootLogger } from './rootLogger';
 
 describe('rootLogger', () => {

packages/backend-common/src/logging/rootLogger.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import winston, { Logger } from 'winston';
+import * as winston from 'winston';
 
-let rootLogger: Logger = winston.createLogger({
+let rootLogger: winston.Logger = winston.createLogger({
   level: process.env.LOG_LEVEL || 'info',
   format:
     process.env.NODE_ENV === 'production'
@@ -35,10 +35,10 @@ let rootLogger: Logger = winston.createLogger({
   ],
 });
 
-export function getRootLogger(): Logger {
+export function getRootLogger(): winston.Logger {
   return rootLogger;
 }
 
-export function setRootLogger(newLogger: Logger) {
+export function setRootLogger(newLogger: winston.Logger) {
   rootLogger = newLogger;
 }

packages/backend-common/src/logging/voidLogger.ts

@@ -15,12 +15,12 @@
  */
 
 import { PassThrough } from 'stream';
-import winston, { Logger } from 'winston';
+import * as winston from 'winston';
 
 /**
  * A logger that just throws away all messages.
  */
-export function getVoidLogger(): Logger {
+export function getVoidLogger(): winston.Logger {
   return winston.createLogger({
     transports: [new winston.transports.Stream({ stream: new PassThrough() })],
   });

packages/backend-common/src/middleware/requestLoggingHandler.test.ts

@@ -16,7 +16,7 @@
 
 import express from 'express';
 import request from 'supertest';
-import winston from 'winston';
+import * as winston from 'winston';
 import { requestLoggingHandler } from './requestLoggingHandler';
 
 describe('requestLoggingHandler', () => {