From fe1b99534924044b6d76b94df6356884d3578d5e Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Mon, 13 Jul 2020 11:14:52 +0300 Subject: [PATCH] fix: webpack --- modules/bunyan.js | 9 ++++----- package.json | 1 + serverRequire.js | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 serverRequire.js diff --git a/modules/bunyan.js b/modules/bunyan.js index 812ba4a..55498e2 100644 --- a/modules/bunyan.js +++ b/modules/bunyan.js @@ -1,5 +1,4 @@ const bunyan = require('bunyan'); -const serverRequire = require; function fixStreams(streams, workDir, loggerOptions) { if (!streams || !streams.length) { @@ -11,10 +10,10 @@ function fixStreams(streams, workDir, loggerOptions) { const result = Object.assign({}, stream); if (stream.stream === 'process.stdout') { if (stream.streamConfig) { - if (typeof window !== 'undefined') { + if (process.browser) { result.stream = require('../consoleStream')(stream.streamConfig); } else { - createStream = serverRequire('../colorStream'); + createStream = require('../serverRequire')('../colorStream'); result.stream = createStream(stream.streamConfig); result.stream.pipe(process.stdout); } @@ -24,7 +23,7 @@ function fixStreams(streams, workDir, loggerOptions) { } } else if (stream.stream === 'process.stderr') { if (stream.streamConfig) { - createStream = serverRequire('../colorStream'); + createStream = require('../serverRequire')('../colorStream'); result.stream = createStream(stream.streamConfig); result.stream.pipe(process.stderr); delete result.streamConfig; @@ -32,7 +31,7 @@ function fixStreams(streams, workDir, loggerOptions) { result.stream = process.stdout; } } else if (typeof stream.stream === 'string') { - createStream = serverRequire(stream.stream); + createStream = require('../serverRequire')(stream.stream); result.streamConfig.workDir = workDir; result.stream = createStream(stream.streamConfig, loggerOptions); delete result.streamConfig; diff --git a/package.json b/package.json index 2ece195..eabc98b 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "@sentry/node": "^5.12.3" }, "browser": { + "./serverRequire": false, "modules/winston": false }, "description": "UT log module", diff --git a/serverRequire.js b/serverRequire.js new file mode 100644 index 0000000..d777b11 --- /dev/null +++ b/serverRequire.js @@ -0,0 +1 @@ +module.exports = require;