fix: webpack

softwaregroup-bg · Jul 13, 2020 · fe1b995 · fe1b995
1 parent ee1cf7c
commit fe1b995
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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,15 +23,15 @@ 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;
             } else {
                 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
@@ -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
@@ -0,0 +1 @@
+module.exports = require;