pnpm 7.13.1 → 7.13.2

package/dist/node_modules/ip/lib/ip.js

@@ -1,24 +1,24 @@
-var ip = exports;
-var { Buffer } = require('buffer');
-var os = require('os');
+const ip = exports;
+const { Buffer } = require('buffer');
+const os = require('os');
 
 ip.toBuffer = function (ip, buff, offset) {
   offset = ~~offset;
 
-  var result;
+  let result;
 
   if (this.isV4Format(ip)) {
-    result = buff || new Buffer(offset + 4);
+    result = buff || Buffer.alloc(offset + 4);
     ip.split(/\./g).map((byte) => {
       result[offset++] = parseInt(byte, 10) & 0xff;
     });
   } else if (this.isV6Format(ip)) {
-    var sections = ip.split(':', 8);
+    const sections = ip.split(':', 8);
 
-    var i;
+    let i;
     for (i = 0; i < sections.length; i++) {
-      var isv4 = this.isV4Format(sections[i]);
-      var v4Buffer;
+      const isv4 = this.isV4Format(sections[i]);
+      let v4Buffer;
 
       if (isv4) {
         v4Buffer = this.toBuffer(sections[i]);
@@ -36,16 +36,16 @@ ip.toBuffer = function (ip, buff, offset) {
       while (sections.length < 8) sections.push('0');
     } else if (sections.length < 8) {
       for (i = 0; i < sections.length && sections[i] !== ''; i++);
-      var argv = [i, 1];
+      const argv = [i, 1];
       for (i = 9 - sections.length; i > 0; i--) {
         argv.push('0');
       }
-      sections.splice.apply(sections, argv);
+      sections.splice(...argv);
     }
 
-    result = buff || new Buffer(offset + 16);
+    result = buff || Buffer.alloc(offset + 16);
     for (i = 0; i < sections.length; i++) {
-      var word = parseInt(sections[i], 16);
+      const word = parseInt(sections[i], 16);
       result[offset++] = (word >> 8) & 0xff;
       result[offset++] = word & 0xff;
     }
@@ -62,17 +62,16 @@ ip.toString = function (buff, offset, length) {
   offset = ~~offset;
   length = length || (buff.length - offset);
 
-  var result = [];
-  var i;
+  let result = [];
   if (length === 4) {
     // IPv4
-    for (i = 0; i < length; i++) {
+    for (let i = 0; i < length; i++) {
       result.push(buff[offset + i]);
     }
     result = result.join('.');
   } else if (length === 16) {
     // IPv6
-    for (i = 0; i < length; i += 2) {
+    for (let i = 0; i < length; i += 2) {
       result.push(buff.readUInt16BE(offset + i).toString(16));
     }
     result = result.join(':');
@@ -83,8 +82,8 @@ ip.toString = function (buff, offset, length) {
   return result;
 };
 
-var ipv4Regex = /^(\d{1,3}\.){3,3}\d{1,3}$/;
-var ipv6Regex = /^(::)?(((\d{1,3}\.){3}(\d{1,3}){1})?([0-9a-f]){0,4}:{0,2}){1,8}(::)?$/i;
+const ipv4Regex = /^(\d{1,3}\.){3,3}\d{1,3}$/;
+const ipv6Regex = /^(::)?(((\d{1,3}\.){3}(\d{1,3}){1})?([0-9a-f]){0,4}:{0,2}){1,8}(::)?$/i;
 
 ip.isV4Format = function (ip) {
   return ipv4Regex.test(ip);
@@ -111,14 +110,14 @@ ip.fromPrefixLen = function (prefixlen, family) {
     family = _normalizeFamily(family);
   }
 
-  var len = 4;
+  let len = 4;
   if (family === 'ipv6') {
     len = 16;
   }
-  var buff = new Buffer(len);
+  const buff = Buffer.alloc(len);
 
-  for (var i = 0, n = buff.length; i < n; ++i) {
-    var bits = 8;
+  for (let i = 0, n = buff.length; i < n; ++i) {
+    let bits = 8;
     if (prefixlen < 8) {
       bits = prefixlen;
     }
@@ -134,10 +133,10 @@ ip.mask = function (addr, mask) {
   addr = ip.toBuffer(addr);
   mask = ip.toBuffer(mask);
 
-  var result = new Buffer(Math.max(addr.length, mask.length));
+  const result = Buffer.alloc(Math.max(addr.length, mask.length));
 
   // Same protocol - do bitwise and
-  var i;
+  let i;
   if (addr.length === mask.length) {
     for (i = 0; i < addr.length; i++) {
       result[i] = addr[i] & mask[i];
@@ -170,30 +169,30 @@ ip.mask = function (addr, mask) {
 };
 
 ip.cidr = function (cidrString) {
-  var cidrParts = cidrString.split('/');
+  const cidrParts = cidrString.split('/');
 
-  var addr = cidrParts[0];
+  const addr = cidrParts[0];
   if (cidrParts.length !== 2) {
     throw new Error(`invalid CIDR subnet: ${addr}`);
   }
 
-  var mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10));
+  const mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10));
 
   return ip.mask(addr, mask);
 };
 
 ip.subnet = function (addr, mask) {
-  var networkAddress = ip.toLong(ip.mask(addr, mask));
+  const networkAddress = ip.toLong(ip.mask(addr, mask));
 
   // Calculate the mask's length.
-  var maskBuffer = ip.toBuffer(mask);
-  var maskLength = 0;
+  const maskBuffer = ip.toBuffer(mask);
+  let maskLength = 0;
 
-  for (var i = 0; i < maskBuffer.length; i++) {
+  for (let i = 0; i < maskBuffer.length; i++) {
     if (maskBuffer[i] === 0xff) {
       maskLength += 8;
     } else {
-      var octet = maskBuffer[i] & 0xff;
+      let octet = maskBuffer[i] & 0xff;
       while (octet) {
         octet = (octet << 1) & 0xff;
         maskLength++;
@@ -201,7 +200,7 @@ ip.subnet = function (addr, mask) {
     }
   }
 
-  var numberOfAddresses = Math.pow(2, 32 - maskLength);
+  const numberOfAddresses = 2 ** (32 - maskLength);
 
   return {
     networkAddress: ip.fromLong(networkAddress),
@@ -224,50 +223,48 @@ ip.subnet = function (addr, mask) {
 };
 
 ip.cidrSubnet = function (cidrString) {
-  var cidrParts = cidrString.split('/');
+  const cidrParts = cidrString.split('/');
 
-  var addr = cidrParts[0];
+  const addr = cidrParts[0];
   if (cidrParts.length !== 2) {
     throw new Error(`invalid CIDR subnet: ${addr}`);
   }
 
-  var mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10));
+  const mask = ip.fromPrefixLen(parseInt(cidrParts[1], 10));
 
   return ip.subnet(addr, mask);
 };
 
 ip.not = function (addr) {
-  var buff = ip.toBuffer(addr);
-  for (var i = 0; i < buff.length; i++) {
+  const buff = ip.toBuffer(addr);
+  for (let i = 0; i < buff.length; i++) {
     buff[i] = 0xff ^ buff[i];
   }
   return ip.toString(buff);
 };
 
 ip.or = function (a, b) {
-  var i;
-
   a = ip.toBuffer(a);
   b = ip.toBuffer(b);
 
   // same protocol
   if (a.length === b.length) {
-    for (i = 0; i < a.length; ++i) {
+    for (let i = 0; i < a.length; ++i) {
       a[i] |= b[i];
     }
     return ip.toString(a);
 
   // mixed protocols
   }
-  var buff = a;
-  var other = b;
+  let buff = a;
+  let other = b;
   if (b.length > a.length) {
     buff = b;
     other = a;
   }
 
-  var offset = buff.length - other.length;
-  for (i = offset; i < buff.length; ++i) {
+  const offset = buff.length - other.length;
+  for (let i = offset; i < buff.length; ++i) {
     buff[i] |= other[i - offset];
   }
 
@@ -275,14 +272,12 @@ ip.or = function (a, b) {
 };
 
 ip.isEqual = function (a, b) {
-  var i;
-
   a = ip.toBuffer(a);
   b = ip.toBuffer(b);
 
   // Same protocol
   if (a.length === b.length) {
-    for (i = 0; i < a.length; i++) {
+    for (let i = 0; i < a.length; i++) {
       if (a[i] !== b[i]) return false;
     }
     return true;
@@ -290,20 +285,20 @@ ip.isEqual = function (a, b) {
 
   // Swap
   if (b.length === 4) {
-    var t = b;
+    const t = b;
     b = a;
     a = t;
   }
 
   // a - IPv4, b - IPv6
-  for (i = 0; i < 10; i++) {
+  for (let i = 0; i < 10; i++) {
     if (b[i] !== 0) return false;
   }
 
-  var word = b.readUInt16BE(10);
+  const word = b.readUInt16BE(10);
   if (word !== 0 && word !== 0xffff) return false;
 
-  for (i = 0; i < 4; i++) {
+  for (let i = 0; i < 4; i++) {
     if (a[i] !== b[i + 12]) return false;
   }
 
@@ -365,7 +360,7 @@ ip.loopback = function (family) {
 //   * undefined: First address with `ipv4` or loopback address `127.0.0.1`.
 //
 ip.address = function (name, family) {
-  var interfaces = os.networkInterfaces();
+  const interfaces = os.networkInterfaces();
 
   //
   // Default to `ipv4`
@@ -377,8 +372,8 @@ ip.address = function (name, family) {
   // return the address.
   //
   if (name && name !== 'private' && name !== 'public') {
-    var res = interfaces[name].filter((details) => {
-      var itemFamily = _normalizeFamily(details.family);
+    const res = interfaces[name].filter((details) => {
+      const itemFamily = _normalizeFamily(details.family);
       return itemFamily === family;
     });
     if (res.length === 0) {
@@ -387,12 +382,12 @@ ip.address = function (name, family) {
     return res[0].address;
   }
 
-  var all = Object.keys(interfaces).map((nic) => {
+  const all = Object.keys(interfaces).map((nic) => {
     //
     // Note: name will only be `public` or `private`
     // when this is called.
     //
-    var addresses = interfaces[nic].filter((details) => {
+    const addresses = interfaces[nic].filter((details) => {
       details.family = _normalizeFamily(details.family);
       if (details.family !== family || ip.isLoopback(details.address)) {
         return false;
@@ -411,7 +406,7 @@ ip.address = function (name, family) {
 };
 
 ip.toLong = function (ip) {
-  var ipl = 0;
+  let ipl = 0;
   ip.split('.').forEach((octet) => {
     ipl <<= 8;
     ipl += parseInt(octet);

package/dist/node_modules/ip/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip",
-  "version": "1.1.8",
+  "version": "2.0.0",
   "author": "Fedor Indutny <fedor@indutny.com>",
   "homepage": "https://github.com/indutny/node-ip",
   "repository": {

package/dist/node_modules/lru-cache/index.js

@@ -157,6 +157,7 @@ class LRUCache {
       noDisposeOnSet,
       noUpdateTTL,
       maxSize = 0,
+      maxEntrySize = 0,
       sizeCalculation,
       fetchMethod,
       fetchContext,
@@ -180,11 +181,12 @@ class LRUCache {
 
     this.max = max
     this.maxSize = maxSize
+    this.maxEntrySize = maxEntrySize || this.maxSize
     this.sizeCalculation = sizeCalculation || length
     if (this.sizeCalculation) {
-      if (!this.maxSize) {
+      if (!this.maxSize && !this.maxEntrySize) {
         throw new TypeError(
-          'cannot set sizeCalculation without setting maxSize'
+          'cannot set sizeCalculation without setting maxSize or maxEntrySize'
         )
       }
       if (typeof this.sizeCalculation !== 'function') {
@@ -231,10 +233,18 @@ class LRUCache {
     this.noUpdateTTL = !!noUpdateTTL
     this.noDeleteOnFetchRejection = !!noDeleteOnFetchRejection
 
-    if (this.maxSize !== 0) {
-      if (!isPosInt(this.maxSize)) {
+    // NB: maxEntrySize is set to maxSize if it's set
+    if (this.maxEntrySize !== 0) {
+      if (this.maxSize !== 0) {
+        if (!isPosInt(this.maxSize)) {
+          throw new TypeError(
+            'maxSize must be a positive integer if specified'
+          )
+        }
+      }
+      if (!isPosInt(this.maxEntrySize)) {
         throw new TypeError(
-          'maxSize must be a positive integer if specified'
+          'maxEntrySize must be a positive integer if specified'
         )
       }
       this.initializeSizeTracking()
@@ -402,7 +412,7 @@ class LRUCache {
   requireSize(k, v, size, sizeCalculation) {
     if (size || sizeCalculation) {
       throw new TypeError(
-        'cannot set size without setting maxSize on cache'
+        'cannot set size without setting maxSize or maxEntrySize on cache'
       )
     }
   }
@@ -574,7 +584,8 @@ class LRUCache {
   ) {
     size = this.requireSize(k, v, size, sizeCalculation)
     // if the item doesn't fit, don't do anything
-    if (this.maxSize && size > this.maxSize) {
+    // NB: maxEntrySize set to maxSize by default
+    if (this.maxEntrySize && size > this.maxEntrySize) {
       return this
     }
     let index = this.size === 0 ? undefined : this.keyMap.get(k)
@@ -688,7 +699,9 @@ class LRUCache {
   peek(k, { allowStale = this.allowStale } = {}) {
     const index = this.keyMap.get(k)
     if (index !== undefined && (allowStale || !this.isStale(index))) {
-      return this.valList[index]
+      const v = this.valList[index]
+      // either stale and allowed, or forcing a refresh of non-stale value
+      return this.isBackgroundFetch(v) ? v.__staleWhileFetching : v
     }
   }
 

package/dist/node_modules/lru-cache/package.json

@@ -1,13 +1,14 @@
 {
   "name": "lru-cache",
   "description": "A cache object that deletes the least-recently-used items.",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "author": "Isaac Z. Schlueter <i@izs.me>",
   "keywords": [
     "mru",
     "lru",
     "cache"
   ],
+  "sideEffects": false,
   "scripts": {
     "build": "",
     "size": "size-limit",
@@ -26,7 +27,7 @@
     "@types/tap": "^15.0.6",
     "benchmark": "^2.1.4",
     "c8": "^7.11.2",
-    "clock-mock": "^1.0.4",
+    "clock-mock": "^1.0.6",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.6.2",
     "size-limit": "^7.0.8",

package/dist/node_modules/make-fetch-happen/lib/cache/entry.js

@@ -35,6 +35,7 @@ const KEEP_RESPONSE_HEADERS = [
   'etag',
   'expires',
   'last-modified',
+  'link',
   'location',
   'pragma',
   'vary',
@@ -287,6 +288,7 @@ class CacheEntry {
         // stick a flag on here so downstream users will know if they can expect integrity events
         tee.pipe(cacheStream)
         // TODO if the cache write fails, log a warning but return the response anyway
+        // eslint-disable-next-line promise/catch-or-return
         cacheStream.promise().then(cacheWriteResolve, cacheWriteReject)
         body.unshift(tee)
         body.unshift(this.response.body)

package/dist/node_modules/make-fetch-happen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-fetch-happen",
-  "version": "10.1.8",
+  "version": "10.2.1",
   "description": "Opinionated, caching, retrying fetch client",
   "main": "lib/index.js",
   "files": [

package/dist/node_modules/minipass-fetch/lib/body.js

@@ -10,7 +10,9 @@ const FetchError = require('./fetch-error.js')
 let convert
 try {
   convert = require('encoding').convert
-} catch (e) {}
+} catch (e) {
+  // defer error until textConverted is called
+}
 
 const INTERNALS = Symbol('Body internals')
 const CONSUME_BODY = Symbol('consumeBody')
@@ -69,16 +71,16 @@ class Body {
     ))
   }
 
-  json () {
-    return this[CONSUME_BODY]().then(buf => {
-      try {
-        return JSON.parse(buf.toString())
-      } catch (er) {
-        return Promise.reject(new FetchError(
-          `invalid json response body at ${
-            this.url} reason: ${er.message}`, 'invalid-json'))
-      }
-    })
+  async json () {
+    const buf = await this[CONSUME_BODY]()
+    try {
+      return JSON.parse(buf.toString())
+    } catch (er) {
+      throw new FetchError(
+        `invalid json response body at ${this.url} reason: ${er.message}`,
+        'invalid-json'
+      )
+    }
   }
 
   text () {

package/dist/node_modules/minipass-fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minipass-fetch",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "An implementation of window.fetch in Node.js using Minipass streams",
   "license": "MIT",
   "main": "lib/index.js",
@@ -23,10 +23,11 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "3.1.2",
+    "@npmcli/template-oss": "3.5.0",
     "@ungap/url-search-params": "^0.2.2",
     "abort-controller": "^3.0.0",
     "abortcontroller-polyfill": "~1.7.3",
+    "encoding": "^0.1.13",
     "form-data": "^4.0.0",
     "nock": "^13.2.4",
     "parted": "^0.1.1",
@@ -61,6 +62,6 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "3.1.2"
+    "version": "3.5.0"
   }
 }

package/dist/node_modules/node-gyp/addon.gypi

@@ -103,6 +103,11 @@
           '-Wl,-bimport:<(node_exp_file)'
         ],
       }],
+      [ 'OS=="os400"', {
+        'ldflags': [
+          '-Wl,-bimport:<(node_exp_file)'
+        ],
+      }],
       [ 'OS=="zos"', {
         'cflags': [
           '-q64',

package/dist/node_modules/node-gyp/gyp/.github/workflows/Python_tests.yml

@@ -11,11 +11,11 @@ jobs:
       max-parallel: 8
       matrix:
         os: [macos-latest, ubuntu-latest] # , windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

package/dist/node_modules/node-gyp/gyp/.github/workflows/node-gyp.yml

@@ -8,23 +8,23 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python: [3.6, 3.9]
+        python: ["3.7", "3.10"]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Clone gyp-next
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: gyp-next
       - name: Clone nodejs/node-gyp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nodejs/node-gyp
           path: node-gyp
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14.x
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
       - name: Install dependencies

package/dist/node_modules/node-gyp/gyp/.github/workflows/nodejs-windows.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Clone gyp-next
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: gyp-next
       - name: Clone nodejs/node
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nodejs/node
           path: node

package/dist/node_modules/node-gyp/gyp/pylib/gyp/__init__.py

@@ -103,6 +103,18 @@ def Load(
     for (key, val) in generator.generator_default_variables.items():
         default_variables.setdefault(key, val)
 
+    output_dir = params["options"].generator_output or params["options"].toplevel_dir
+    if default_variables["GENERATOR"] == "ninja":
+        default_variables.setdefault(
+            "PRODUCT_DIR_ABS",
+            os.path.join(output_dir, "out", default_variables["build_type"]),
+        )
+    else:
+        default_variables.setdefault(
+            "PRODUCT_DIR_ABS",
+            os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]),
+        )
+
     # Give the generator the opportunity to set additional variables based on
     # the params it will receive in the output phase.
     if getattr(generator, "CalculateVariables", None):

package/dist/node_modules/node-gyp/gyp/pylib/gyp/common.py

@@ -454,6 +454,8 @@ def GetFlavor(params):
         return "aix"
     if sys.platform.startswith(("os390", "zos")):
         return "zos"
+    if sys.platform == "os400":
+        return "os400"
 
     return "linux"
 
@@ -463,9 +465,13 @@ def CopyTool(flavor, out_path, generator_flags={}):
   to |out_path|."""
     # aix and solaris just need flock emulation. mac and win use more complicated
     # support scripts.
-    prefix = {"aix": "flock", "solaris": "flock", "mac": "mac", "win": "win"}.get(
-        flavor, None
-    )
+    prefix = {
+        "aix": "flock",
+        "os400": "flock",
+        "solaris": "flock",
+        "mac": "mac",
+        "win": "win",
+    }.get(flavor, None)
     if not prefix:
         return
 

package/dist/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py

@@ -41,7 +41,7 @@ class FlockTool:
         # with EBADF, that's why we use this F_SETLK
         # hack instead.
         fd = os.open(lockfile, os.O_WRONLY | os.O_NOCTTY | os.O_CREAT, 0o666)
-        if sys.platform.startswith("aix"):
+        if sys.platform.startswith("aix") or sys.platform == "os400":
             # Python on AIX is compiled with LARGEFILE support, which changes the
             # struct size.
             op = struct.pack("hhIllqq", fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)