@rushstack/module-minifier 0.6.35 → 0.7.0

package/CHANGELOG.json

@@ -1,6 +1,38 @@
 {
   "name": "@rushstack/module-minifier",
   "entries": [
+    {
+      "version": "0.7.0",
+      "tag": "@rushstack/module-minifier_v0.7.0",
+      "date": "Wed, 22 Jan 2025 03:03:47 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Add a `workerResourceLimits` option to the `WorkerPoolMinifier` constructor to control the available resources to the workers."
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/worker-pool\" to `0.5.0`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.6.36",
+      "tag": "@rushstack/module-minifier_v0.6.36",
+      "date": "Thu, 09 Jan 2025 01:10:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/worker-pool\" to `0.4.81`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.68.13`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.35",
       "tag": "@rushstack/module-minifier_v0.6.35",

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log - @rushstack/module-minifier
 
-This log was last generated on Tue, 07 Jan 2025 22:17:32 GMT and should not be manually modified.
+This log was last generated on Wed, 22 Jan 2025 03:03:47 GMT and should not be manually modified.
+
+## 0.7.0
+Wed, 22 Jan 2025 03:03:47 GMT
+
+### Minor changes
+
+- Add a `workerResourceLimits` option to the `WorkerPoolMinifier` constructor to control the available resources to the workers.
+
+## 0.6.36
+Thu, 09 Jan 2025 01:10:10 GMT
+
+_Version update only_
 
 ## 0.6.35
 Tue, 07 Jan 2025 22:17:32 GMT

package/dist/module-minifier.d.ts

@@ -10,6 +10,7 @@
 
 import { MinifyOptions } from 'terser';
 import type { RawSourceMap } from 'source-map';
+import type { ResourceLimits } from 'worker_threads';
 import type * as WorkerThreads from 'worker_threads';
 
 /**
@@ -179,6 +180,10 @@ export declare interface IWorkerPoolMinifierOptions {
      * If true, log to the console about the minification results.
      */
     verbose?: boolean;
+    /**
+     * Optional resource limits for the workers.
+     */
+    workerResourceLimits?: ResourceLimits;
 }
 
 /**

package/dist/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.48.1"
+      "packageVersion": "7.49.1"
     }
   ]
 }

package/lib/WorkerPoolMinifier.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import type { ResourceLimits } from 'worker_threads';
 import type { MinifyOptions } from 'terser';
 import type { IMinifierConnection, IModuleMinificationCallback, IModuleMinificationRequest, IModuleMinifier } from './types';
 /**
@@ -19,6 +21,10 @@ export interface IWorkerPoolMinifierOptions {
      * If true, log to the console about the minification results.
      */
     verbose?: boolean;
+    /**
+     * Optional resource limits for the workers.
+     */
+    workerResourceLimits?: ResourceLimits;
 }
 /**
  * Minifier implementation that uses a thread pool for minification.

package/lib/WorkerPoolMinifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolMinifier.d.ts","sourceRoot":"","sources":["../src/WorkerPoolMinifier.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAG5C,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAE3B,0BAA0B,EAC1B,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB;;;GAGG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;gBAE1D,OAAO,EAAE,0BAA0B;IA8BtD,IAAW,UAAU,IAAI,MAAM,CAE9B;IAED,IAAW,UAAU,CAAC,OAAO,EAAE,MAAM,EAEpC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAO,EAAE,0BAA0B,EAAE,QAAQ,EAAE,2BAA2B,GAAG,IAAI;IAuD/F;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA+BzD;;OAEG;IAEU,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAGrD"}
+{"version":3,"file":"WorkerPoolMinifier.d.ts","sourceRoot":"","sources":["../src/WorkerPoolMinifier.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAG5C,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAE3B,0BAA0B,EAC1B,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB;;;GAGG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,oBAAoB,CAAC,EAAE,cAAc,CAAC;CACvC;AAED;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;gBAE1D,OAAO,EAAE,0BAA0B;IAoCtD,IAAW,UAAU,IAAI,MAAM,CAE9B;IAED,IAAW,UAAU,CAAC,OAAO,EAAE,MAAM,EAEpC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAO,EAAE,0BAA0B,EAAE,QAAQ,EAAE,2BAA2B,GAAG,IAAI;IAuD/F;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA+BzD;;OAEG;IAEU,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAGrD"}

package/lib/WorkerPoolMinifier.js

@@ -16,14 +16,15 @@ const worker_pool_1 = require("@rushstack/worker-pool");
  */
 class WorkerPoolMinifier {
     constructor(options) {
-        const { maxThreads = (0, os_1.cpus)().length, terserOptions = {}, verbose = false } = options || {};
+        const { maxThreads = (0, os_1.cpus)().length, terserOptions = {}, verbose = false, workerResourceLimits } = options || {};
         const activeRequests = new Map();
         const resultCache = new Map();
         const terserPool = new worker_pool_1.WorkerPool({
             id: 'Minifier',
             maxWorkers: maxThreads,
             workerData: terserOptions,
-            workerScriptPath: require.resolve('./MinifierWorker')
+            workerScriptPath: require.resolve('./MinifierWorker'),
+            workerResourceLimits
         });
         const { version: terserVersion } = require('terser/package.json');
         this._configHash = (0, crypto_1.createHash)('sha256')

package/lib/WorkerPoolMinifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolMinifier.js","sourceRoot":"","sources":["../src/WorkerPoolMinifier.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.\n// See LICENSE in the project root for license information.\n\nimport { createHash } from 'crypto';\nimport { cpus } from 'os';\n\nimport serialize from 'serialize-javascript';\nimport type { MinifyOptions } from 'terser';\nimport { WorkerPool } from '@rushstack/worker-pool';\n\nimport type {\n  IMinifierConnection,\n  IModuleMinificationCallback,\n  IModuleMinificationResult,\n  IModuleMinificationRequest,\n  IModuleMinifier\n} from './types';\n\n/**\n * Options for configuring the WorkerPoolMinifier\n * @public\n */\nexport interface IWorkerPoolMinifierOptions {\n  /**\n   * Maximum number of worker threads to use. Will never use more than there are modules to process.\n   * Defaults to os.cpus().length\n   */\n  maxThreads?: number;\n  /**\n   * The options to forward to Terser.\n   * `output.comments` is currently not configurable and will always extract license comments to a separate file.\n   */\n  terserOptions?: MinifyOptions;\n\n  /**\n   * If true, log to the console about the minification results.\n   */\n  verbose?: boolean;\n}\n\n/**\n * Minifier implementation that uses a thread pool for minification.\n * @public\n */\nexport class WorkerPoolMinifier implements IModuleMinifier {\n  private readonly _pool: WorkerPool;\n  private readonly _verbose: boolean;\n  private readonly _configHash: string;\n\n  private _refCount: number;\n  private _deduped: number;\n  private _minified: number;\n\n  private readonly _resultCache: Map<string, IModuleMinificationResult>;\n  private readonly _activeRequests: Map<string, IModuleMinificationCallback[]>;\n\n  public constructor(options: IWorkerPoolMinifierOptions) {\n    const { maxThreads = cpus().length, terserOptions = {}, verbose = false } = options || {};\n\n    const activeRequests: Map<string, IModuleMinificationCallback[]> = new Map();\n    const resultCache: Map<string, IModuleMinificationResult> = new Map();\n    const terserPool: WorkerPool = new WorkerPool({\n      id: 'Minifier',\n      maxWorkers: maxThreads,\n      workerData: terserOptions,\n      workerScriptPath: require.resolve('./MinifierWorker')\n    });\n\n    const { version: terserVersion } = require('terser/package.json');\n\n    this._configHash = createHash('sha256')\n      .update(WorkerPoolMinifier.name, 'utf8')\n      .update(`terser@${terserVersion}`)\n      .update(serialize(terserOptions))\n      .digest('base64');\n\n    this._activeRequests = activeRequests;\n    this._refCount = 0;\n    this._resultCache = resultCache;\n    this._pool = terserPool;\n    this._verbose = verbose;\n\n    this._deduped = 0;\n    this._minified = 0;\n  }\n\n  public get maxThreads(): number {\n    return this._pool.maxWorkers;\n  }\n\n  public set maxThreads(threads: number) {\n    this._pool.maxWorkers = threads;\n  }\n\n  /**\n   * Transform code by farming it out to a worker pool.\n   * @param request - The request to process\n   * @param callback - The callback to invoke\n   */\n  public minify(request: IModuleMinificationRequest, callback: IModuleMinificationCallback): void {\n    const { hash } = request;\n\n    const cached: IModuleMinificationResult | undefined = this._resultCache.get(hash);\n    if (cached) {\n      ++this._deduped;\n      return callback(cached);\n    }\n\n    const { _activeRequests: activeRequests } = this;\n    const callbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(hash);\n    if (callbacks) {\n      ++this._deduped;\n      callbacks.push(callback);\n      return;\n    }\n\n    activeRequests.set(hash, [callback]);\n    ++this._minified;\n\n    this._pool\n      .checkoutWorkerAsync(true)\n      .then((worker) => {\n        const cb: (message: IModuleMinificationResult) => void = (\n          message: IModuleMinificationResult\n        ): void => {\n          worker.off('message', cb);\n          const workerCallbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(\n            message.hash\n          )!;\n          activeRequests.delete(message.hash);\n          this._resultCache.set(message.hash, message);\n          for (const workerCallback of workerCallbacks) {\n            workerCallback(message);\n          }\n          // This should always be the last thing done with the worker\n          this._pool.checkinWorker(worker);\n        };\n\n        worker.on('message', cb);\n        worker.postMessage(request);\n      })\n      .catch((error: Error) => {\n        const errorCallbacks: IModuleMinificationCallback[] = activeRequests.get(hash)!;\n        for (const errorCallback of errorCallbacks) {\n          errorCallback({\n            hash,\n            error,\n            code: undefined,\n            map: undefined\n          });\n        }\n      });\n  }\n\n  /**\n   * {@inheritdoc IModuleMinifier.connectAsync}\n   */\n  public async connectAsync(): Promise<IMinifierConnection> {\n    if (++this._refCount === 1) {\n      this._pool.reset();\n    }\n\n    const disconnectAsync: IMinifierConnection['disconnectAsync'] = async () => {\n      if (--this._refCount === 0) {\n        if (this._verbose) {\n          // eslint-disable-next-line no-console\n          console.log(`Shutting down minifier worker pool`);\n        }\n        await this._pool.finishAsync();\n        this._resultCache.clear();\n        this._activeRequests.clear();\n        if (this._verbose) {\n          // eslint-disable-next-line no-console\n          console.log(`Module minification: ${this._deduped} Deduped, ${this._minified} Processed`);\n        }\n      }\n      this._deduped = 0;\n      this._minified = 0;\n    };\n\n    return {\n      configHash: this._configHash,\n\n      disconnectAsync,\n      disconnect: disconnectAsync\n    };\n  }\n\n  /**\n   * @deprecated Use {@link WorkerPoolMinifier.connectAsync} instead\n   */\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  public async connect(): Promise<IMinifierConnection> {\n    return await this.connectAsync();\n  }\n}\n"]}
+{"version":3,"file":"WorkerPoolMinifier.js","sourceRoot":"","sources":["../src/WorkerPoolMinifier.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.\n// See LICENSE in the project root for license information.\n\nimport { createHash } from 'crypto';\nimport { cpus } from 'os';\nimport type { ResourceLimits } from 'worker_threads';\n\nimport serialize from 'serialize-javascript';\nimport type { MinifyOptions } from 'terser';\nimport { WorkerPool } from '@rushstack/worker-pool';\n\nimport type {\n  IMinifierConnection,\n  IModuleMinificationCallback,\n  IModuleMinificationResult,\n  IModuleMinificationRequest,\n  IModuleMinifier\n} from './types';\n\n/**\n * Options for configuring the WorkerPoolMinifier\n * @public\n */\nexport interface IWorkerPoolMinifierOptions {\n  /**\n   * Maximum number of worker threads to use. Will never use more than there are modules to process.\n   * Defaults to os.cpus().length\n   */\n  maxThreads?: number;\n  /**\n   * The options to forward to Terser.\n   * `output.comments` is currently not configurable and will always extract license comments to a separate file.\n   */\n  terserOptions?: MinifyOptions;\n\n  /**\n   * If true, log to the console about the minification results.\n   */\n  verbose?: boolean;\n\n  /**\n   * Optional resource limits for the workers.\n   */\n  workerResourceLimits?: ResourceLimits;\n}\n\n/**\n * Minifier implementation that uses a thread pool for minification.\n * @public\n */\nexport class WorkerPoolMinifier implements IModuleMinifier {\n  private readonly _pool: WorkerPool;\n  private readonly _verbose: boolean;\n  private readonly _configHash: string;\n\n  private _refCount: number;\n  private _deduped: number;\n  private _minified: number;\n\n  private readonly _resultCache: Map<string, IModuleMinificationResult>;\n  private readonly _activeRequests: Map<string, IModuleMinificationCallback[]>;\n\n  public constructor(options: IWorkerPoolMinifierOptions) {\n    const {\n      maxThreads = cpus().length,\n      terserOptions = {},\n      verbose = false,\n      workerResourceLimits\n    } = options || {};\n\n    const activeRequests: Map<string, IModuleMinificationCallback[]> = new Map();\n    const resultCache: Map<string, IModuleMinificationResult> = new Map();\n    const terserPool: WorkerPool = new WorkerPool({\n      id: 'Minifier',\n      maxWorkers: maxThreads,\n      workerData: terserOptions,\n      workerScriptPath: require.resolve('./MinifierWorker'),\n      workerResourceLimits\n    });\n\n    const { version: terserVersion } = require('terser/package.json');\n\n    this._configHash = createHash('sha256')\n      .update(WorkerPoolMinifier.name, 'utf8')\n      .update(`terser@${terserVersion}`)\n      .update(serialize(terserOptions))\n      .digest('base64');\n\n    this._activeRequests = activeRequests;\n    this._refCount = 0;\n    this._resultCache = resultCache;\n    this._pool = terserPool;\n    this._verbose = verbose;\n\n    this._deduped = 0;\n    this._minified = 0;\n  }\n\n  public get maxThreads(): number {\n    return this._pool.maxWorkers;\n  }\n\n  public set maxThreads(threads: number) {\n    this._pool.maxWorkers = threads;\n  }\n\n  /**\n   * Transform code by farming it out to a worker pool.\n   * @param request - The request to process\n   * @param callback - The callback to invoke\n   */\n  public minify(request: IModuleMinificationRequest, callback: IModuleMinificationCallback): void {\n    const { hash } = request;\n\n    const cached: IModuleMinificationResult | undefined = this._resultCache.get(hash);\n    if (cached) {\n      ++this._deduped;\n      return callback(cached);\n    }\n\n    const { _activeRequests: activeRequests } = this;\n    const callbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(hash);\n    if (callbacks) {\n      ++this._deduped;\n      callbacks.push(callback);\n      return;\n    }\n\n    activeRequests.set(hash, [callback]);\n    ++this._minified;\n\n    this._pool\n      .checkoutWorkerAsync(true)\n      .then((worker) => {\n        const cb: (message: IModuleMinificationResult) => void = (\n          message: IModuleMinificationResult\n        ): void => {\n          worker.off('message', cb);\n          const workerCallbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(\n            message.hash\n          )!;\n          activeRequests.delete(message.hash);\n          this._resultCache.set(message.hash, message);\n          for (const workerCallback of workerCallbacks) {\n            workerCallback(message);\n          }\n          // This should always be the last thing done with the worker\n          this._pool.checkinWorker(worker);\n        };\n\n        worker.on('message', cb);\n        worker.postMessage(request);\n      })\n      .catch((error: Error) => {\n        const errorCallbacks: IModuleMinificationCallback[] = activeRequests.get(hash)!;\n        for (const errorCallback of errorCallbacks) {\n          errorCallback({\n            hash,\n            error,\n            code: undefined,\n            map: undefined\n          });\n        }\n      });\n  }\n\n  /**\n   * {@inheritdoc IModuleMinifier.connectAsync}\n   */\n  public async connectAsync(): Promise<IMinifierConnection> {\n    if (++this._refCount === 1) {\n      this._pool.reset();\n    }\n\n    const disconnectAsync: IMinifierConnection['disconnectAsync'] = async () => {\n      if (--this._refCount === 0) {\n        if (this._verbose) {\n          // eslint-disable-next-line no-console\n          console.log(`Shutting down minifier worker pool`);\n        }\n        await this._pool.finishAsync();\n        this._resultCache.clear();\n        this._activeRequests.clear();\n        if (this._verbose) {\n          // eslint-disable-next-line no-console\n          console.log(`Module minification: ${this._deduped} Deduped, ${this._minified} Processed`);\n        }\n      }\n      this._deduped = 0;\n      this._minified = 0;\n    };\n\n    return {\n      configHash: this._configHash,\n\n      disconnectAsync,\n      disconnect: disconnectAsync\n    };\n  }\n\n  /**\n   * @deprecated Use {@link WorkerPoolMinifier.connectAsync} instead\n   */\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  public async connect(): Promise<IMinifierConnection> {\n    return await this.connectAsync();\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier",
-  "version": "0.6.35",
+  "version": "0.7.0",
   "description": "Wrapper for terser to support bulk parallel minification.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier.d.ts",
@@ -14,12 +14,12 @@
     "serialize-javascript": "6.0.0",
     "source-map": "~0.7.3",
     "terser": "^5.9.0",
-    "@rushstack/worker-pool": "0.4.80"
+    "@rushstack/worker-pool": "0.5.0"
   },
   "devDependencies": {
     "@types/serialize-javascript": "5.0.2",
-    "local-node-rig": "1.0.0",
-    "@rushstack/heft": "0.68.12"
+    "@rushstack/heft": "0.68.13",
+    "local-node-rig": "1.0.0"
   },
   "peerDependencies": {
     "@types/node": "*"