@parcel/utils 2.11.0 → 2.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -17,7 +17,7 @@
   "main": "lib/index.js",
   "source": "src/index.js",
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 16.0.0"
   },
   "targets": {
     "main": {
@@ -33,13 +33,13 @@
     }
   },
   "dependencies": {
-    "@parcel/codeframe": "2.11.0",
-    "@parcel/diagnostic": "2.11.0",
-    "@parcel/logger": "2.11.0",
-    "@parcel/markdown-ansi": "2.11.0",
-    "@parcel/rust": "2.11.0",
+    "@parcel/codeframe": "2.13.0",
+    "@parcel/diagnostic": "2.13.0",
+    "@parcel/logger": "2.13.0",
+    "@parcel/markdown-ansi": "2.13.0",
+    "@parcel/rust": "2.13.0",
     "@parcel/source-map": "^2.1.1",
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.2",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
@@ -51,12 +51,11 @@
     "is-glob": "^4.0.0",
     "is-url": "^1.2.2",
     "json5": "^2.2.0",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^10.0.0",
     "micromatch": "^4.0.4",
     "node-forge": "^1.2.1",
     "nullthrows": "^1.1.1",
     "open": "^7.0.3",
-    "random-int": "^1.0.0",
     "snarkdown": "^2.0.0",
     "strip-ansi": "^6.0.0",
     "terminal-link": "^2.1.1"
@@ -67,5 +66,5 @@
     "./src/openInBrowser.js": false,
     "@parcel/markdown-ansi": false
   },
-  "gitHead": "f8076f1644cabc944695b5ec82602c8ae32bcf21"
+  "gitHead": "a53f8f3ba1025c7ea8653e9719e0a61ef9717079"
 }

package/src/PromiseQueue.js

@@ -13,6 +13,7 @@ export default class PromiseQueue<T> {
   _error: mixed;
   _count: number = 0;
   _results: Array<T> = [];
+  _addSubscriptions: Set<() => void> = new Set();
 
   constructor(opts: PromiseQueueOpts = {maxConcurrent: Infinity}) {
     if (opts.maxConcurrent <= 0) {
@@ -43,12 +44,24 @@ export default class PromiseQueue<T> {
 
       this._queue.push(wrapped);
 
+      for (const addFn of this._addSubscriptions) {
+        addFn();
+      }
+
       if (this._numRunning > 0 && this._numRunning < this._maxConcurrent) {
         this._next();
       }
     });
   }
 
+  subscribeToAdd(fn: () => void): () => void {
+    this._addSubscriptions.add(fn);
+
+    return () => {
+      this._addSubscriptions.delete(fn);
+    };
+  }
+
   run(): Promise<Array<T>> {
     if (this._runPromise != null) {
       return this._runPromise;

package/src/alternatives.js

@@ -1,6 +1,6 @@
 // @flow
 import path from 'path';
-import type {FileSystem} from '@parcel/fs';
+import type {FileSystem} from '@parcel/types';
 import {fuzzySearch} from './schema';
 import {relativePath} from './path';
 import {resolveConfig} from './config';
@@ -141,5 +141,5 @@ export async function findAlternativeFiles(
     });
   }
 
-  return fuzzySearch(potentialFiles, fileSpecifier).slice(0, 2);
+  return fuzzySearch(potentialFiles.sort(), fileSpecifier).slice(0, 2);
 }

package/src/config.js

@@ -7,7 +7,7 @@ import path from 'path';
 import clone from 'clone';
 import json5 from 'json5';
 import {parse as toml} from '@iarna/toml';
-import LRU from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 
 export type ConfigOutput = {|
   config: ConfigResult,
@@ -19,7 +19,7 @@ export type ConfigOptions = {|
   parser?: string => any,
 |};
 
-const configCache = new LRU<FilePath, ConfigOutput>({max: 500});
+const configCache = new LRUCache<FilePath, ConfigOutput>({max: 500});
 const resolveCache = new Map();
 
 export function resolveConfig(
@@ -96,7 +96,7 @@ export async function loadConfig(
 }
 
 loadConfig.clear = () => {
-  configCache.reset();
+  configCache.clear();
   resolveCache.clear();
 };
 

package/src/index.js

@@ -86,3 +86,4 @@ export {
   remapSourceLocation,
 } from './sourcemap';
 export {default as stripAnsi} from 'strip-ansi';
+export {detectSVGOVersion} from './svgo';

package/src/svgo.js

@@ -0,0 +1,50 @@
+// @flow
+export function detectSVGOVersion(
+  config: any,
+): {|version: 3|} | {|version: 2, path: string|} {
+  if (!config) {
+    return {version: 3};
+  }
+
+  // These options were removed in v2.
+  if (config.full != null || config.svg2js != null) {
+    return {version: 2, path: config.full != null ? '/full' : '/svg2js'};
+  }
+
+  if (Array.isArray(config.plugins)) {
+    // Custom plugins in v2 had additional (required) fields that don't exist anymore.
+    let v2Plugin = config.plugins.findIndex(
+      p => p?.type != null || (p?.fn && p?.params != null),
+    );
+    if (v2Plugin !== -1) {
+      let field = config.plugins[v2Plugin].type != null ? 'type' : 'params';
+      return {version: 2, path: `/plugins/${v2Plugin}/${field}`};
+    }
+
+    // the cleanupIDs plugin lost the prefix option in v3.
+    let cleanupIdsIndex = config.plugins.findIndex(
+      p => p?.name === 'cleanupIDs',
+    );
+    let cleanupIDs =
+      cleanupIdsIndex !== -1 ? config.plugins[cleanupIdsIndex] : null;
+    if (cleanupIDs?.params?.prefix != null) {
+      return {version: 2, path: `/plugins/${cleanupIdsIndex}/params/prefix`};
+    }
+
+    // Automatically migrate some options from SVGO 2 config files.
+    config.plugins = config.plugins.filter(p => p?.active !== false);
+
+    for (let i = 0; i < config.plugins.length; i++) {
+      let p = config.plugins[i];
+      if (p === 'cleanupIDs') {
+        config.plugins[i] = 'cleanupIds';
+      }
+
+      if (p?.name === 'cleanupIDs') {
+        config.plugins[i].name = 'cleanupIds';
+      }
+    }
+  }
+
+  return {version: 3};
+}

package/test/PromiseQueue.test.js

@@ -1,8 +1,8 @@
 // @flow
 import assert from 'assert';
-import randomInt from 'random-int';
 
 import PromiseQueue from '../src/PromiseQueue';
+import sinon from 'sinon';
 
 describe('PromiseQueue', () => {
   it('run() should resolve when all async functions in queue have completed', async () => {
@@ -65,11 +65,38 @@ describe('PromiseQueue', () => {
         running++;
         assert(queue._numRunning === running);
         assert(running <= maxConcurrent);
-        await Promise.resolve(randomInt(1, 10)); //sleep(randomInt(1, 10));
+        await Promise.resolve(Math.floor(Math.random() * 10) + 1);
         running--;
       }),
     );
 
     await queue.run();
   });
+
+  it('.add() should notify subscribers', async () => {
+    const queue = new PromiseQueue();
+
+    const subscribedFn = sinon.spy();
+    queue.subscribeToAdd(subscribedFn);
+
+    const promise = queue.add(() => Promise.resolve());
+    await queue.run();
+    await promise;
+
+    assert(subscribedFn.called);
+  });
+
+  it('.subscribeToAdd() should allow unsubscribing', async () => {
+    const queue = new PromiseQueue();
+
+    const subscribedFn = sinon.spy();
+    const unsubscribe = queue.subscribeToAdd(subscribedFn);
+    unsubscribe();
+
+    const promise = queue.add(() => Promise.resolve());
+    await queue.run();
+    await promise;
+
+    assert(!subscribedFn.called);
+  });
 });