fix: respect cacheable

Author: alexander-akait

src/WorkerPool.js

@@ -320,16 +320,18 @@ class PoolWorker {
         // 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);
+        const internalName = data.name || '__internal__';
+        if (!Object.hasOwnProperty.call(jobData.loggers, internalName)) {
+          jobData.loggers[internalName] = jobData.getLogger(data.name);
         }
         finalCallback();
         break;
       }
       case 'logger': {
         const { data } = message;
         const { data: jobData } = this.jobs[id];
-        const logger = jobData.loggers[data.name];
+        const internalName = data.name || '__internal__';
+        const logger = jobData.loggers[internalName];
         logger[data.method](...data.args);
         finalCallback();
         break;

src/index.js

@@ -63,6 +63,8 @@ function pitch() {
     },
     (err, r) => {
       if (r) {
+        this.cacheable(r.cacheable);
+
         r.fileDependencies.forEach((d) => this.addDependency(d));
         r.contextDependencies.forEach((d) => this.addContextDependency(d));
         r.missingDependencies.forEach((d) => this.addMissingDependency(d));

src/worker.js

@@ -240,10 +240,6 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
             return options;
           },
           getLogger: (name) => {
-            if (typeof name === 'function') {
-              // eslint-disable-next-line no-param-reassign
-              name = name();
-            }
             function writeLoggerJson(method, args) {
               writeJson({
                 type: 'logger',

test/__snapshots__/webpack.test.js.snap

@@ -7,6 +7,29 @@ Test Message Error],
 ]
 `;
 
+exports[`Works with test-loader: logs 1`] = `
+[
+  [
+    {
+      "args": [
+        "test message",
+      ],
+      "trace": undefined,
+      "type": "info",
+    },
+  ],
+  [
+    {
+      "args": [
+        "test message",
+      ],
+      "trace": undefined,
+      "type": "log",
+    },
+  ],
+]
+`;
+
 exports[`Works with test-loader: result 1`] = `
 {
   "addBuildDependency": "function",

test/basic-loader-test/test-loader.js

@@ -1,6 +1,8 @@
 const path = require('path');
 
 module.exports = async function testLoader() {
+  this.cacheable(false);
+
   const options = this.getOptions();
   const callback = this.async();
 
@@ -10,6 +12,15 @@ module.exports = async function testLoader() {
   this.addDependency(require.resolve('./dep.js'));
   this.addBuildDependency(require.resolve('./build-dep.js'));
   this.addContextDependency(path.resolve(__dirname, './directory'));
+
+  const logger = this.getLogger('name');
+
+  logger.info('test message');
+
+  const logger1 = this.getLogger();
+
+  logger1.log('test message');
+
   // Todo fix me
   // this.addMissingDependency(require.resolve("./missing-dep.js"));
 
@@ -38,6 +49,7 @@ module.exports = async function testLoader() {
       currentRequest: this.currentRequest,
       previousRequest: this.previousRequest,
       query: this.query,
+      // Todo fix me
       data: this.data,
       hot: this.hot,
       cacheable: typeof this.cacheable,

test/webpack.test.js

@@ -59,10 +59,17 @@ test('Works with test-loader', (done) => {
     expect(stats.compilation.errors).toMatchSnapshot('errors');
     expect(stats.compilation.warnings).toMatchSnapshot('warnings');
 
+    const logs = Array.from(stats.compilation.logging.entries())
+      .filter((item) => /file\.js\?q=1#hash/.test(item[0]))
+      .map((item) => item[1].map(({ time, ...rest }) => rest));
+
+    expect(logs).toMatchSnapshot('logs');
+
     const [testMod] = [...stats.compilation.modules].filter(
       (i) => i.rawRequest === './file.js?q=1#hash'
     );
 
+    expect(testMod.buildInfo.cacheable).toBe(false);
     // eslint-disable-next-line no-eval, no-underscore-dangle
     expect(eval(testMod._source.source())).toMatchSnapshot('result');