fix: revert do not run parallel mode when you have only one file (#146)

webpack-contrib · Sep 6, 2019 · 6613a97 · 6613a97
1 parent 815e533
commit 6613a97
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/TaskRunner.js b/src/TaskRunner.js
@@ -41,7 +41,7 @@ export default class TaskRunner {
   }
 
   async run(tasks) {
-    if (this.numberWorkers > 1 && tasks.length > 1) {
+    if (this.numberWorkers > 1) {
       this.worker = new Worker(workerPath, { numWorkers: this.numberWorkers });
     }
 

diff --git a/src/index.js b/src/index.js
@@ -262,18 +262,18 @@ class TerserPlugin {
           }
         });
 
-      let completedTasks = [];
+      if (tasks.length === 0) {
+        return Promise.resolve();
+      }
 
-      if (tasks.length > 0) {
-        const taskRunner = new TaskRunner({
-          cache: this.options.cache,
-          parallel: this.options.parallel,
-        });
+      const taskRunner = new TaskRunner({
+        cache: this.options.cache,
+        parallel: this.options.parallel,
+      });
 
-        completedTasks = await taskRunner.run(tasks);
+      const completedTasks = await taskRunner.run(tasks);
 
-        await taskRunner.exit();
-      }
+      await taskRunner.exit();
 
       completedTasks.forEach((completedTask, index) => {
         const { file, input, inputSourceMap, commentsFile } = tasks[index];

diff --git a/test/parallel-option.test.js b/test/parallel-option.test.js
@@ -154,7 +154,14 @@ describe('parallel option', () => {
     const errors = stats.compilation.errors.map(cleanErrorStack);
     const warnings = stats.compilation.warnings.map(cleanErrorStack);
 
-    expect(Worker).toHaveBeenCalledTimes(0);
+    expect(Worker).toHaveBeenCalledTimes(1);
+    expect(Worker).toHaveBeenLastCalledWith(workerPath, {
+      numWorkers: os.cpus().length - 1,
+    });
+    expect(workerTransform).toHaveBeenCalledTimes(
+      Object.keys(stats.compilation.assets).length
+    );
+    expect(workerEnd).toHaveBeenCalledTimes(1);
 
     expect(errors).toMatchSnapshot('errors');
     expect(warnings).toMatchSnapshot('warnings');