fix: plumb log messages back through to parent logger

webpack-contrib · Dec 16, 2021 · ce90da5 · ce90da5
1 parent b4418ae
commit ce90da5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/src/WorkerPool.js b/src/WorkerPool.js
@@ -285,6 +285,21 @@ class PoolWorker {
         finalCallback();
         break;
       }
+      case 'getLogger': {
+        // initialise logger by name in jobData
+        const { data } = message;
+        const { data: jobData } = this.jobs[id];
+        if (!Object.hasOwnProperty.call(jobData.loggers, data.name)) {
+          jobData.loggers[data.name] = jobData.getLogger(data.name);
+        }
+        break;
+      }
+      case 'logger': {
+        const { data } = message;
+        const { data: jobData } = this.jobs[id];
+        jobData.loggers[data.name][data.severity](data.message);
+        break;
+      }
       default: {
         console.error(`Unexpected worker message ${type} in WorkerPool.`);
         finalCallback();

diff --git a/src/index.js b/src/index.js
@@ -25,6 +25,8 @@ function pitch() {
       sourceMap: this.sourceMap,
       emitError: this.emitError,
       emitWarning: this.emitWarning,
+      getLogger: this.getLogger,
+      loggers: {},
       loadModule: this.loadModule,
       resolve: this.resolve,
       getResolve: this.getResolve,

diff --git a/src/worker.js b/src/worker.js
@@ -213,21 +213,33 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
             return options;
           },
           getLogger: (name) => {
+            function writeLoggerJson(severity, message) {
+              writeJson({
+                type: 'logger',
+                id,
+                data: { severity, name, message },
+              });
+            }
+            writeJson({
+              type: 'getLogger',
+              id,
+              data: { name },
+            });
             return {
               error(message) {
-                console.error(`${name}: ${message}`);
+                writeLoggerJson('error', message);
               },
 
               warn(message) {
-                console.warn(`${name}: ${message}`);
+                writeLoggerJson('warn', message);
               },
 
               log(message) {
-                console.log(`${name}: ${message}`);
+                writeLoggerJson('log', message);
               },
 
               debug(message) {
-                console.debug(`${name}: ${message}`);
+                writeLoggerJson('debug', message);
               },
             };
           },

diff --git a/test/sass-loader-example/assets/color_palette.scss b/test/sass-loader-example/assets/color_palette.scss
@@ -1 +1 @@
-$white: #FFFFFF;
+$white: #ffffff;