@rollup/plugin-terser 0.4.0 → 0.4.2

package/dist/cjs/index.js

@@ -11,6 +11,10 @@ var os = require('os');
 var events = require('events');
 var serializeJavascript = require('serialize-javascript');
 
+const taskInfo = Symbol('taskInfo');
+const freeWorker = Symbol('freeWorker');
+const workerPoolWorkerFlag = 'WorkerPoolWorker';
+
 /**
  * Duck typing worker context.
  *
@@ -24,7 +28,7 @@ function isWorkerContextSerialized(input) {
         typeof input.options === 'string');
 }
 function runWorker() {
-    if (worker_threads.isMainThread || !worker_threads.parentPort) {
+    if (worker_threads.isMainThread || !worker_threads.parentPort || worker_threads.workerData !== workerPoolWorkerFlag) {
         return;
     }
     // eslint-disable-next-line no-eval
@@ -49,9 +53,6 @@ function runWorker() {
     });
 }
 
-const taskInfo = Symbol('taskInfo');
-const freeWorker = Symbol('freeWorker');
-
 class WorkerPoolTaskInfo extends async_hooks.AsyncResource {
     constructor(callback) {
         super('WorkerPoolTaskInfo');
@@ -102,7 +103,9 @@ class WorkerPool extends events.EventEmitter {
         }
     }
     addNewWorker() {
-        const worker = new worker_threads.Worker(this.filePath);
+        const worker = new worker_threads.Worker(this.filePath, {
+            workerData: workerPoolWorkerFlag
+        });
         worker.on('message', (result) => {
             var _a;
             (_a = worker[taskInfo]) === null || _a === void 0 ? void 0 : _a.done(null, result);

package/dist/es/index.js

@@ -1,4 +1,4 @@
-import { isMainThread, parentPort, Worker } from 'worker_threads';
+import { isMainThread, parentPort, workerData, Worker } from 'worker_threads';
 import { isObject, hasOwnProperty, merge } from 'smob';
 import { minify } from 'terser';
 import { fileURLToPath } from 'url';
@@ -7,6 +7,10 @@ import { cpus } from 'os';
 import { EventEmitter } from 'events';
 import serializeJavascript from 'serialize-javascript';
 
+const taskInfo = Symbol('taskInfo');
+const freeWorker = Symbol('freeWorker');
+const workerPoolWorkerFlag = 'WorkerPoolWorker';
+
 /**
  * Duck typing worker context.
  *
@@ -20,7 +24,7 @@ function isWorkerContextSerialized(input) {
         typeof input.options === 'string');
 }
 function runWorker() {
-    if (isMainThread || !parentPort) {
+    if (isMainThread || !parentPort || workerData !== workerPoolWorkerFlag) {
         return;
     }
     // eslint-disable-next-line no-eval
@@ -45,9 +49,6 @@ function runWorker() {
     });
 }
 
-const taskInfo = Symbol('taskInfo');
-const freeWorker = Symbol('freeWorker');
-
 class WorkerPoolTaskInfo extends AsyncResource {
     constructor(callback) {
         super('WorkerPoolTaskInfo');
@@ -98,7 +99,9 @@ class WorkerPool extends EventEmitter {
         }
     }
     addNewWorker() {
-        const worker = new Worker(this.filePath);
+        const worker = new Worker(this.filePath, {
+            workerData: workerPoolWorkerFlag
+        });
         worker.on('message', (result) => {
             var _a;
             (_a = worker[taskInfo]) === null || _a === void 0 ? void 0 : _a.done(null, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-terser",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "publishConfig": {
     "access": "public"
   },

package/src/constants.ts

@@ -1,2 +1,3 @@
 export const taskInfo = Symbol('taskInfo');
 export const freeWorker = Symbol('freeWorker');
+export const workerPoolWorkerFlag = 'WorkerPoolWorker';

package/src/worker-pool.ts

@@ -5,7 +5,7 @@ import { EventEmitter } from 'events';
 
 import serializeJavascript from 'serialize-javascript';
 
-import { freeWorker, taskInfo } from './constants';
+import { freeWorker, taskInfo, workerPoolWorkerFlag } from './constants';
 
 import type {
   WorkerCallback,
@@ -81,7 +81,9 @@ export class WorkerPool extends EventEmitter {
   }
 
   private addNewWorker() {
-    const worker: WorkerWithTaskInfo = new Worker(this.filePath);
+    const worker: WorkerWithTaskInfo = new Worker(this.filePath, {
+      workerData: workerPoolWorkerFlag
+    });
 
     worker.on('message', (result) => {
       worker[taskInfo]?.done(null, result);

package/src/worker.ts

@@ -1,9 +1,11 @@
-import { isMainThread, parentPort } from 'worker_threads';
+import { isMainThread, parentPort, workerData } from 'worker_threads';
 
 import { hasOwnProperty, isObject } from 'smob';
 
 import { minify } from 'terser';
 
+import { workerPoolWorkerFlag } from './constants';
+
 import type { WorkerContextSerialized, WorkerOutput } from './type';
 
 /**
@@ -22,7 +24,7 @@ function isWorkerContextSerialized(input: unknown): input is WorkerContextSerial
 }
 
 export function runWorker() {
-  if (isMainThread || !parentPort) {
+  if (isMainThread || !parentPort || workerData !== workerPoolWorkerFlag) {
     return;
   }
 

package/types/index.d.ts

@@ -1,10 +1,15 @@
 import type { Plugin } from 'rollup';
 import type { MinifyOptions } from 'terser';
 
+export interface Options extends MinifyOptions {
+  nameCache?: Record<string, any>;
+  maxWorkers?: number;
+}
+
 /**
  * A Rollup plugin to generate a minified output bundle.
  *
  * @param options - Plugin options.
  * @returns Plugin instance.
  */
-export default function terser(options?: MinifyOptions): Plugin;
+export default function terser(options?: Options): Plugin;